Merge branch 'dev_arch_opt_3.0' into 'dev_robobus-m1-p-app-module_1.0.0_230112_1.0.0'

Dev arch opt 3.0

See merge request zhjt/AndroidApp/MoGoEagleEye!523

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -9,6 +9,7 @@ import android.graphics.Color
 import android.os.Build
 import android.text.Html
 import android.util.AttributeSet
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import androidx.annotation.RequiresApi
@@ -607,7 +608,6 @@ internal class DebugSettingView @JvmOverloads constructor(
             tbIsDemoMode.visibility = View.GONE
         }
 
-
         // 雨天模式，上一次勾选的数据
         tbIsRainMode.isChecked = FunctionBuildConfig.isRainMode
         //雨天模式
@@ -624,36 +624,30 @@ internal class DebugSettingView @JvmOverloads constructor(
         //感知优化模式
         tbBeautyMode.setOnCheckedChangeListener { _, isChecked ->
             FunctionBuildConfig.isBeautyMode = isChecked
-            if (!FunctionBuildConfig.isBeautyMode) {
-                tbBeautyMode.isChecked = false
-            }
         }
 
         tbV2NFromCar.isChecked = FunctionBuildConfig.isV2NFromCar
         //v2n车端预警
         tbV2NFromCar.setOnCheckedChangeListener { _, isChecked ->
             FunctionBuildConfig.isV2NFromCar = isChecked
-            if (!FunctionBuildConfig.isV2NFromCar) {
-                tbV2NFromCar.isChecked = false
-            }
         }
 
         tbDrawAiCloudFusion.isChecked = FunctionBuildConfig.isDrawAiCloudFusion
         //云端感知绘制
         tbDrawAiCloudFusion.setOnCheckedChangeListener { _, isChecked ->
             FunctionBuildConfig.isDrawAiCloudFusion = isChecked
-            if (!FunctionBuildConfig.isDrawAiCloudFusion) {
-                tbDrawAiCloudFusion.isChecked = false
-            }
         }
 
         tbDrawRomaMode.isChecked = FunctionBuildConfig.isRomaMode
         //roma
         tbDrawRomaMode.setOnCheckedChangeListener { _, isChecked ->
             FunctionBuildConfig.isRomaMode = isChecked
-            if (!FunctionBuildConfig.isRomaMode) {
-                tbDrawRomaMode.isChecked = false
-            }
+        }
+
+        tbObuWarningFusionUnion.isChecked = FunctionBuildConfig.isObuWarningFusionUnion
+        //ObuWarningFusionUnion
+        tbObuWarningFusionUnion.setOnCheckedChangeListener { _, isChecked ->
+            FunctionBuildConfig.isObuWarningFusionUnion = isChecked
         }
 
         //重启工控机所有节点
@@ -749,12 +743,6 @@ internal class DebugSettingView @JvmOverloads constructor(
             FunctionBuildConfig.isDrawUnknownIdentifyData = isChecked
         }
 
-//        // 初始化 OBU感知数据是否绘制 选择情况
-//        tbIsDrawOBUIdentifyData.isChecked = FunctionBuildConfig.isDrawObuIdentifyData
-//        tbIsDrawOBUIdentifyData.setOnCheckedChangeListener { buttonView, isChecked ->
-//            FunctionBuildConfig.isDrawObuIdentifyData = isChecked
-//        }
-
         //TODO
         tbIsDrawPath.setOnCheckedChangeListener { _, isChecked ->
 
@@ -1062,18 +1050,6 @@ internal class DebugSettingView @JvmOverloads constructor(
      * 设置Hmi点击监听
      */
     private fun setHmiCheckedChangeListener() {
-
-        /**
-         * 隐藏、显示小地图
-         */
-        tbControlView.setOnCheckedChangeListener { _, isChecked ->
-//            if (isChecked) {
-//                CallerSmpManager.hidePanel()
-//            } else {
-//                CallerSmpManager.showPanel()
-//            }
-        }
-
         /**
          * sn绑定控制
          */

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/SteeringBrakeView.kt

@@ -16,6 +16,7 @@ import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.Utils
 import kotlinx.android.synthetic.main.view_steering_brake.view.*
 
@@ -73,13 +74,16 @@ class SteeringBrakeView(context: Context, attrs: AttributeSet?) : ConstraintLayo
         //can数据转发  转向灯状态 0是正常 1是左转 2是右转
         if (lightSwitch != null) {
             CallerLogger.d("$M_HMI$TAG", "---lightSwitch.getNumber() = " + lightSwitch.number)
-            if (lightSwitch.number == 1 || lightSwitch.number == 2) {
-                isShowTurnLight = true
-                brakeView.visibility = View.VISIBLE
-                brakeView.setBrakeLight(0)
-            } else {
-                brakeView.visibility = View.GONE
-                isShowTurnLight = false
+            ThreadUtils.runOnUiThread {
+                if (lightSwitch.number == 1 || lightSwitch.number == 2) {
+                    isShowTurnLight = true
+                    brakeView.visibility = View.VISIBLE
+                    brakeView.setBrakeLight(0)
+                } else {
+                    brakeView.visibility = View.GONE
+                    isShowTurnLight = false
+                }
+                turnLightView.visibility = View.VISIBLE
             }
         }
     }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TurnLightViewStatus.kt

@@ -16,6 +16,7 @@ import com.mogo.eagle.core.function.api.map.angle.Turning
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
 import com.mogo.eagle.core.function.hmi.R
+import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import kotlinx.android.synthetic.main.view_steering_brake.view.*
 import kotlinx.android.synthetic.main.view_turn_light_status.view.*
 import kotlinx.coroutines.Dispatchers
@@ -71,8 +72,10 @@ open class TurnLightViewStatus @JvmOverloads constructor(
     override fun onAutopilotLightSwitchData(lightSwitch: Chassis.LightSwitch?) {
         super.onAutopilotLightSwitchData(lightSwitch)
         lightSwitch?.let {
-            turnLightView.visibility = View.VISIBLE
-            setTurnLight(it)
+            ThreadUtils.runOnUiThread {
+                turnLightView.visibility = View.VISIBLE
+                setTurnLight(it)
+            }
         }
     }
 

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml

@@ -278,6 +278,18 @@
                 android:textOn="关闭漫游模式"
                 android:textSize="@dimen/dp_24" />
 
+            <ToggleButton
+                android:id="@+id/tbObuWarningFusionUnion"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:padding="@dimen/dp_20"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启obu预警融合"
+                android:textOn="关闭obu预警融合"
+                android:textSize="@dimen/dp_24" />
+
             <ToggleButton
                 android:id="@+id/tbMojie"
                 android:layout_width="match_parent"
@@ -1310,18 +1322,6 @@
                         app:layout_constraintLeft_toRightOf="@+id/tbChangeCurrentCarIcon"
                         app:layout_constraintTop_toTopOf="@id/tbChangeCurrentCarIcon" />
 
-                    <ToggleButton
-                        android:id="@+id/tbControlView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_columnWeight="1"
-                        android:layout_margin="2dp"
-                        android:gravity="center"
-                        android:padding="@dimen/dp_20"
-                        android:textOff="隐藏「小地图」"
-                        android:textOn="显示「小地图」"
-                        android:textSize="@dimen/dp_24" />
-
                     <ToggleButton
                         android:id="@+id/tbOpenSnBinding"
                         android:layout_width="wrap_content"