Commit fb6853a7 by ydl

Merge branch 'feature/image_picker' of…

Merge branch 'feature/image_picker' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into feature/image_picker
parents 36d5e768 50b51006
...@@ -42,8 +42,8 @@ ext { ...@@ -42,8 +42,8 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.47.6", "m-confide" : "0.0.47.7",
"m-consultant" : "0.0.57.1", "m-consultant" : "0.0.57.2",
"m-fm" : "0.0.28", "m-fm" : "0.0.28",
"m-user" : "0.0.58.1", "m-user" : "0.0.58.1",
"m-home" : "0.0.19.1", "m-home" : "0.0.19.1",
...@@ -75,7 +75,7 @@ ext { ...@@ -75,7 +75,7 @@ ext {
"ydl-webview" : "0.0.37.1", "ydl-webview" : "0.0.37.1",
"ydl-media" : "0.0.20", "ydl-media" : "0.0.20",
"ydl-pay" : "0.0.17", "ydl-pay" : "0.0.17",
"m-audioim" : "0.0.46.4", "m-audioim" : "0.0.46.5",
"ydl-flutter-base": "0.0.10", "ydl-flutter-base": "0.0.10",
//以下 几乎不会动 //以下 几乎不会动
...@@ -121,7 +121,7 @@ ext { ...@@ -121,7 +121,7 @@ ext {
"ydl-webview" : "0.0.37.1", "ydl-webview" : "0.0.37.1",
"ydl-media" : "0.0.20", "ydl-media" : "0.0.20",
"ydl-pay" : "0.0.17", "ydl-pay" : "0.0.17",
"m-audioim" : "0.0.46.4", "m-audioim" : "0.0.46.5",
"ydl-flutter-base": "0.0.10", "ydl-flutter-base": "0.0.10",
//以下 几乎不会动 //以下 几乎不会动
......
...@@ -171,6 +171,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi ...@@ -171,6 +171,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
private var channelManager: ChannelManager? = null private var channelManager: ChannelManager? = null
private var isLeavelChannel: Boolean = false private var isLeavelChannel: Boolean = false
private var hasUpLoadLog = false
/** /**
* 声网事件回调 (SDK 通过指定的事件通知应用程序 SDK 的运行事件,如: 加入或离开频道,新用户加入频道等) * 声网事件回调 (SDK 通过指定的事件通知应用程序 SDK 的运行事件,如: 加入或离开频道,新用户加入频道等)
...@@ -395,7 +396,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi ...@@ -395,7 +396,7 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
vibrator = getSystemService(Service.VIBRATOR_SERVICE) as Vibrator? vibrator = getSystemService(Service.VIBRATOR_SERVICE) as Vibrator?
} }
private fun writeAgoraLog(){ private fun writeAgoraLog() {
val logBean = AgoraLogInfoBean( val logBean = AgoraLogInfoBean(
expertHeadUrl, expertHeadUrl,
expertName, expertName,
...@@ -1078,8 +1079,11 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi ...@@ -1078,8 +1079,11 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
} }
private fun uploadLog(){ private fun uploadLog() {
LogHelper.getInstance().uploadLog(false) if (!hasUpLoadLog) {
hasUpLoadLog = true
LogHelper.getInstance().uploadLog(false)
}
} }
override fun finishActivity() { override fun finishActivity() {
...@@ -1092,6 +1096,8 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi ...@@ -1092,6 +1096,8 @@ class AudioHomeActivity : BaseMvpActivity<IAudioHomeActivityContract.View, IAudi
handler = null handler = null
} }
hasUpLoadLog = false
if (waitDisposable != null) { if (waitDisposable != null) {
waitDisposable!!.dispose() waitDisposable!!.dispose()
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment