Commit f35d39b7 by 刘鹏

Merge branch 'fix/lp/lp_fix_confide' into 'release'

feat: 修复倾诉绑定的手机号问题

See merge request app_android_lib/YDL-Component!167
parents cdd04085 aad70c51
......@@ -5,7 +5,7 @@ ext {
ydlPublishVersion = [
// -------------- 业务模块 --------------
//第三步 若干
"m-confide" : "0.0.50.27",
"m-confide" : "0.0.50.32",
"m-consultant" : "0.0.60.68",
"m-fm" : "0.0.30.09",
"m-user" : "0.0.62.54",
......@@ -29,7 +29,7 @@ ext {
"ydl-webview" : "0.0.38.93",
"ydl-media" : "0.0.21.52",
"ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.30.19",
"m-audioim" : "0.0.49.30.22",
"ydl-flutter-base": "0.0.14.38",
......@@ -92,7 +92,7 @@ ext {
ydlCompileVersion = [
// -------------- 业务模块 --------------
//第三步 若干
"m-confide" : "0.0.50.27",
"m-confide" : "0.0.50.32",
"m-consultant" : "0.0.60.68",
"m-fm" : "0.0.30.09",
"m-user" : "0.0.62.54",
......@@ -117,7 +117,7 @@ ext {
"ydl-webview" : "0.0.38.93",
"ydl-media" : "0.0.21.52",
"ydl-pay" : "0.0.18.19",
"m-audioim" : "0.0.49.30.19",
"m-audioim" : "0.0.49.30.22",
"ydl-flutter-base": "0.0.14.38",
//以下 几乎不会动
......
......@@ -561,7 +561,7 @@ class AudioHomeActivity :
writeAgoraLog("主叫方发送的邀请通话消息内容:$content", true)
AliYunRichLogsHelper.getInstance()
.sendRichLog(AliYunLogConfig.AGORA, "主叫方发送的邀请通话消息内容:$content")
localRemainTime = (totalDuration ?: 1500).minus(remainTime?.toInt() ?: 1500)
localRemainTime = remainTime?.toInt() ?: 1500
handler = Handler()
vibrator = getSystemService(Service.VIBRATOR_SERVICE) as Vibrator?
......
......@@ -107,7 +107,7 @@
android:id="@+id/tv_notes"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="已通话时长"
android:text="剩余时长:"
android:textColor="@color/white"
android:textSize="18sp"
app:layout_constraintEnd_toStartOf="@+id/tv_remain_time"
......
......@@ -335,6 +335,9 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
@SuppressLint("ClickableViewAccessibility")
private fun webViewInit(wv_content: ProgressWebView) {
val userService = findRouteService(IUserService::class.java)
val isLogin = userService.isLogin()
first_order.visibility = if (isLogin) View.GONE else View.VISIBLE
val setting: WebSettings = wv_content?.settings!!
//支持js
setting.setJavaScriptEnabled(true)
......@@ -583,10 +586,11 @@ class ConfideBottomSheetDialogFragment : BottomSheetDialogFragment() {
}
//登录成功
fun onEvent(event: UserLoginEvent) {
loadUrl()
webViewInit(wv_content)
}
//绑定成功
fun onEvent(event: UserBindPhoneEvent) {
loadUrl()
webViewInit(wv_content)
}
}
\ No newline at end of file
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