Commit 74af6004 by 严久程

发版

parent 89b7bbfc
...@@ -5,7 +5,7 @@ ext { ...@@ -5,7 +5,7 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.48.71", "m-confide" : "0.0.48.73",
"m-consultant" : "0.0.59.23", "m-consultant" : "0.0.59.23",
"m-fm" : "0.0.30.00", "m-fm" : "0.0.30.00",
"m-user" : "0.0.60.20", "m-user" : "0.0.60.20",
...@@ -33,13 +33,13 @@ ext { ...@@ -33,13 +33,13 @@ ext {
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
//第一步 //第一步
"ydl-platform" : "0.0.39.40", "ydl-platform" : "0.0.39.41",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.32", "ydl-webview" : "0.0.38.32",
"ydl-media" : "0.0.21.6", "ydl-media" : "0.0.21.6",
"ydl-pay" : "0.0.18.9", "ydl-pay" : "0.0.18.9",
"m-audioim" : "0.0.49.29.4", "m-audioim" : "0.0.49.29.6",
"ydl-flutter-base": "0.0.14.16", "ydl-flutter-base": "0.0.14.16",
//以下 几乎不会动 //以下 几乎不会动
...@@ -114,13 +114,13 @@ ext { ...@@ -114,13 +114,13 @@ ext {
//-------------- 功能组件 -------------- //-------------- 功能组件 --------------
//第一步 //第一步
"ydl-platform" : "0.0.39.40", "ydl-platform" : "0.0.39.41",
//第二步 若干 //第二步 若干
"ydl-webview" : "0.0.38.31", "ydl-webview" : "0.0.38.31",
"ydl-media" : "0.0.21.6", "ydl-media" : "0.0.21.6",
"ydl-pay" : "0.0.18.9", "ydl-pay" : "0.0.18.9",
"m-audioim" : "0.0.49.29.4", "m-audioim" : "0.0.49.29.6",
"ydl-flutter-base": "0.0.14.14", "ydl-flutter-base": "0.0.14.14",
//以下 几乎不会动 //以下 几乎不会动
......
...@@ -773,6 +773,8 @@ class ConsultantAudioHomeActivity : BaseMvpActivity<IConsultantAudioHomeActivity ...@@ -773,6 +773,8 @@ class ConsultantAudioHomeActivity : BaseMvpActivity<IConsultantAudioHomeActivity
uploadException("主叫取消", zhu = "") uploadException("主叫取消", zhu = "")
showToast("对方已挂断") showToast("对方已挂断")
} }
ActivityManager.getInstance().removeStack(activity = this)
LogUtil.e("[agora]页面移除")
finish() finish()
} }
} }
......
...@@ -20,7 +20,7 @@ class ActivityManager { ...@@ -20,7 +20,7 @@ class ActivityManager {
} }
fun finishAll() { fun finishAll() {
for(a in getInstance().activates) { for (a in getInstance().activates) {
a.finish() a.finish()
} }
getInstance().activates.clear() getInstance().activates.clear()
...@@ -38,8 +38,8 @@ class ActivityManager { ...@@ -38,8 +38,8 @@ class ActivityManager {
*/ */
fun finishOtherActivity(activity: Activity) { fun finishOtherActivity(activity: Activity) {
for (act in getInstance().activates){ for (act in getInstance().activates) {
if (act == activity)continue if (act == activity) continue
act.finish() act.finish()
} }
} }
...@@ -61,7 +61,7 @@ class ActivityManager { ...@@ -61,7 +61,7 @@ class ActivityManager {
} }
// 从栈中移除 // 从栈中移除
internal fun removeStack(activity: Activity) { fun removeStack(activity: Activity) {
if (activates.contains(activity)) { if (activates.contains(activity)) {
activates.remove(activity) activates.remove(activity)
} }
......
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