[dev_opt_2.15.0] 合并dev_arch_opt_3.0分支并解决冲突

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

@@ -7,6 +7,7 @@ import android.content.ClipboardManager
 import android.content.Context
 import android.graphics.Color
 import android.os.Build
+import android.os.Process
 import android.text.Html
 import android.util.AttributeSet
 import android.util.Log
@@ -64,9 +65,7 @@ import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.function.hmi.ui.logcatch.ILogViewListener
 import com.mogo.eagle.core.function.hmi.ui.logcatch.LogInfoView
 import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
-import com.mogo.eagle.core.utilcode.kotlin.currentPadding
-import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner
-import com.mogo.eagle.core.utilcode.kotlin.onClick
+import com.mogo.eagle.core.utilcode.kotlin.*
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel
@@ -81,7 +80,7 @@ import com.mogo.map.uicontroller.VisualAngleMode.*
 import kotlinx.android.synthetic.main.view_debug_setting.view.*
 import kotlinx.android.synthetic.main.view_debug_setting.view.tbRouteDynamicEffect
 import kotlinx.android.synthetic.main.view_sop_setting.view.*
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 import mogo.telematics.pad.MessagePad
 import mogo_msg.MogoReportMsg
 import java.text.SimpleDateFormat
@@ -152,8 +151,7 @@ internal class DebugSettingView @JvmOverloads constructor(
 
     //OBU连接状态
     private var obuConnectStatus: Boolean = false
-    private var mObuVersionName: String = ""
-    private var mObuDeviceId: String = ""
+    private var mObuInfoStr: String = ""
 
     //渠道包标签
     private var onlineSelected: Boolean = true
@@ -575,7 +573,7 @@ internal class DebugSettingView @JvmOverloads constructor(
         setLogCheckedChangeListener()
 
         //OBU配置信息
-        tvObuInfo.text = CallerObuConnectListenerManager.getObuStatusInfoJsonString()
+//        tvObuInfo.text = CallerObuConnectListenerManager.getObuStatusInfoJsonString()
 
         //工控机配置信息
         tvAutopilotInfo.text =
@@ -633,6 +631,18 @@ internal class DebugSettingView @JvmOverloads constructor(
             tbIsDemoMode.visibility = View.GONE
         }
 
+        tbIsStrictMode?.also {
+            it.isChecked = SharedPrefs.getInstance(Utils.getApp()).getBoolean("MOGO_STRICT_MODE_ENABLED", false)
+            it.setOnCheckedChangeListener { _, isChecked ->
+                SharedPrefs.getInstance(Utils.getApp()).putBoolean("MOGO_STRICT_MODE_ENABLED", isChecked)
+                scope.launch {
+                    ToastUtils.showShort("配置生效, 2秒后重启应用...")
+                    delay(2000)
+                    restartApp()
+                }
+            }
+        }
+
         // 雨天模式，上一次勾选的数据
         tbIsRainMode.isChecked = FunctionBuildConfig.isRainMode
         //雨天模式
@@ -1538,7 +1548,6 @@ internal class DebugSettingView @JvmOverloads constructor(
             }"
         )
 
-
         tvServerSocketStatus.text = Html.fromHtml(
             "服务器Socket状态：${
                 if (MogoStatusManager.getInstance().isSocketOnLine) {
@@ -1643,15 +1652,12 @@ internal class DebugSettingView @JvmOverloads constructor(
         mRouteInfoSize = 0
 
         if (FunctionBuildConfig.isDemoMode) {
-            tbIsDemoMode.text = "关闭美化模式"
+            tbIsDemoMode?.text = "关闭美化模式"
         } else {
-            tbIsDemoMode.text = "开启美化模式"
+            tbIsDemoMode?.text = "开启美化模式"
         }
-
-        //obu TODO 后面会添加很多os那边需要显示的内容
-        obuVersionNameTv.text = Html.fromHtml(
-            "OBU版本号：$mObuVersionName"
-        )
+        //obu信息，排查obu相关问题使用
+        tvObuInfoContent.text = mObuInfoStr
 
         obuConnectStatusTv.text = Html.fromHtml(
             "OBU连接状态：${
@@ -1670,7 +1676,7 @@ internal class DebugSettingView @JvmOverloads constructor(
      */
     override fun onConnectStatus(obuStatusInfo: ObuStatusInfo) {
         lifecycleOwner.lifecycleScope.launch {
-            tvObuInfo.text = GsonUtils.toJson(obuStatusInfo)
+//            tvObuInfo.text = GsonUtils.toJson(obuStatusInfo)
 
             AppConfigInfo.obuSdkVersion = obuStatusInfo.obuSdkVersion
             AppConfigInfo.isConnectObu = obuStatusInfo.obuStatus
@@ -2052,6 +2058,11 @@ internal class DebugSettingView @JvmOverloads constructor(
         }
     }
 
+    private fun restartApp() {
+        Utils.getApp().startActivity(Utils.getApp().packageManager.getLaunchIntentForPackage(Utils.getApp().packageName))
+        Process.killProcess(Process.myPid())
+    }
+
     override fun fwThreadClose() {
         refreshTraceInfo()
     }
@@ -2061,12 +2072,7 @@ internal class DebugSettingView @JvmOverloads constructor(
         setLogCheckedChangeListener()
     }
 
-    override fun onGetObuVersionName(obuVersionName: String) {
-        mObuVersionName = obuVersionName
+    override fun onGetObuInfo(obuInfoStr: String) {
+        mObuInfoStr = obuInfoStr
     }
-
-    override fun onObuDeviceId(obuDeviceId: String) {
-        mObuDeviceId = obuDeviceId
-    }
-
 }

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

@@ -229,6 +229,18 @@
                 android:layout_height="1dp"
                 android:background="#F0F0F0" />
 
+            <ToggleButton
+                android:id="@+id/tbIsStrictMode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:padding="@dimen/dp_20"
+                android:textOff="开启严格模式"
+                android:textOn="关闭严格模式"
+                android:textSize="@dimen/dp_24" />
+
             <ToggleButton
                 android:id="@+id/tbIsDemoMode"
                 android:layout_width="match_parent"
@@ -1085,16 +1097,16 @@
                         android:background="#F0F0F0"
                         app:layout_constraintTop_toBottomOf="@id/btnSetObuIP" />
 
-                    <TextView
-                        android:id="@+id/tvObuInfo"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="@dimen/dp_5"
-                        android:minLines="4"
-                        android:text="OBU配置信息"
-                        android:textColor="#000"
-                        android:textSize="@dimen/dp_24"
-                        app:layout_constraintTop_toBottomOf="@id/obuDivider" />
+<!--                    <TextView-->
+<!--                        android:id="@+id/tvObuInfo"-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:layout_margin="@dimen/dp_5"-->
+<!--                        android:minLines="3"-->
+<!--                        android:text="OBU配置信息"-->
+<!--                        android:textColor="#000"-->
+<!--                        android:textSize="@dimen/dp_24"-->
+<!--                        app:layout_constraintTop_toBottomOf="@id/obuDivider" />-->
 
                     <LinearLayout
                         android:id="@+id/obuStatusCenterLayout"
@@ -1103,31 +1115,33 @@
                         android:orientation="vertical"
                         android:visibility="visible"
                         tools:visibility="visible"
-                        app:layout_constraintTop_toBottomOf="@id/tvObuInfo"
+                        app:layout_constraintTop_toBottomOf="@id/obuDivider"
                         tools:ignore="MissingConstraints">
-
-                    <TextView
-                        android:id="@+id/obuVersionNameTv"
-                        style="@style/DebugSettingText"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="#F0F0F0" />
-
-                    <TextView
-                        android:id="@+id/obuConnectStatusTv"
-                        style="@style/DebugSettingText"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="#F0F0F0" />
-
+                        <TextView
+                            android:id="@+id/obuConnectStatusTv"
+                            style="@style/DebugSettingText"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="1dp"
+                            android:background="#F0F0F0" />
+                        <TextView
+                            android:id="@+id/obuVersionNameTv"
+                            style="@style/DebugSettingText"
+                            android:text="OBU信息："
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="1dp"
+                            android:background="#F0F0F0" />
+                        <TextView
+                            android:id="@+id/tvObuInfoContent"
+                            style="@style/DebugSettingText"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:minLines="3" />
                     </LinearLayout>
 
                 </androidx.constraintlayout.widget.ConstraintLayout>