Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

# Conflicts:
#	OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/LoadingMapStatusView.kt
This commit is contained in:
donghongyu-pc
2024-10-29 17:49:38 +08:00
15 changed files with 106 additions and 16 deletions

View File

@@ -146,9 +146,8 @@ class TeleMsgHandler : IMsgHandler {
val content = String(it.body, Charset.defaultCharset())
Log.d(TAG, "乘客屏收到司机屏转发的新链路开关 --- 2 ---:$content")
val data = GsonUtils.fromJson(content, Map::class.java)
val f1 = data["f1"] as Boolean
val f2 = data["f2"] as Boolean
Log.d(TAG, "乘客屏收到司机屏转发的新链路开关 --- 3 ---:$data, f1: $f1, f2:$f2")
val f1 = data["f1"] as? Boolean ?: false
Log.d(TAG, "乘客屏收到司机屏转发的新链路开关 --- 3 ---:$data, f1: $f1")
FunctionBuildConfig.v2nTotalSwitch = f1
} catch (t: Throwable) {
t.printStackTrace()