Commit f1d3e4db by 霍志良

feat:30秒倒计时挂断

parent 8a448150
...@@ -5,7 +5,7 @@ ext { ...@@ -5,7 +5,7 @@ ext {
ydlPublishVersion = [ ydlPublishVersion = [
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.43", "m-confide" : "0.0.49.49",
"m-consultant" : "0.0.60.03", "m-consultant" : "0.0.60.03",
"m-fm" : "0.0.30.04", "m-fm" : "0.0.30.04",
"m-user" : "0.0.61.94", "m-user" : "0.0.61.94",
...@@ -39,7 +39,7 @@ ext { ...@@ -39,7 +39,7 @@ ext {
"ydl-webview" : "0.0.38.47", "ydl-webview" : "0.0.38.47",
"ydl-media" : "0.0.21.42", "ydl-media" : "0.0.21.42",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.29.61", "m-audioim" : "0.0.49.29.67",
"ydl-flutter-base": "0.0.14.38", "ydl-flutter-base": "0.0.14.38",
//以下 几乎不会动 //以下 几乎不会动
...@@ -88,7 +88,7 @@ ext { ...@@ -88,7 +88,7 @@ ext {
// -------------- 业务模块 -------------- // -------------- 业务模块 --------------
//第三步 若干 //第三步 若干
"m-confide" : "0.0.49.43", "m-confide" : "0.0.49.49",
"m-consultant" : "0.0.60.03", "m-consultant" : "0.0.60.03",
"m-fm" : "0.0.30.07", "m-fm" : "0.0.30.07",
"m-user" : "0.0.61.94", "m-user" : "0.0.61.94",
...@@ -121,7 +121,7 @@ ext { ...@@ -121,7 +121,7 @@ ext {
"ydl-webview" : "0.0.38.47", "ydl-webview" : "0.0.38.47",
"ydl-media" : "0.0.21.42", "ydl-media" : "0.0.21.42",
"ydl-pay" : "0.0.18.19", "ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.29.61", "m-audioim" : "0.0.49.29.67",
"ydl-flutter-base": "0.0.14.38", "ydl-flutter-base": "0.0.14.38",
//以下 几乎不会动 //以下 几乎不会动
......
...@@ -721,7 +721,7 @@ class AudioHomeActivity : ...@@ -721,7 +721,7 @@ class AudioHomeActivity :
//开始50s等待倒计时 //开始50s等待倒计时
waitDisposable = waitDisposable =
Observable.interval(0, 100, TimeUnit.MILLISECONDS).subscribeOn(Schedulers.computation()) Observable.interval(0, 100, TimeUnit.MILLISECONDS).subscribeOn(Schedulers.computation())
.take(700).observeOn(AndroidSchedulers.mainThread()).subscribe({ .take(600).observeOn(AndroidSchedulers.mainThread()).subscribe({
val remainTime = 50 - it / 10 val remainTime = 50 - it / 10
if (remainTime <= 0) { if (remainTime <= 0) {
waittingStatus() waittingStatus()
...@@ -732,9 +732,9 @@ class AudioHomeActivity : ...@@ -732,9 +732,9 @@ class AudioHomeActivity :
if (remainTime<=20){ if (remainTime<=20){
audio_hangup_text.text="挂断" audio_hangup_text.text="挂断"
}else{ }else{
audio_hangup_text.text="挂断(${remainTime-20})s" audio_hangup_text.text="挂断(${remainTime-20}s)"
} }
var result = it.toFloat() -20 var result = it.toFloat()/3f
progress_view.setProgress(result) progress_view.setProgress(result)
if (result >= 100f && !iv_hang_up.isEnabled) { if (result >= 100f && !iv_hang_up.isEnabled) {
audio_hangup_text.text="挂断" audio_hangup_text.text="挂断"
......
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