Merge branch 'dev_arch_opt_3.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into 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
@@ -621,6 +620,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
         //雨天模式
@@ -1628,11 +1639,10 @@ internal class DebugSettingView @JvmOverloads constructor(
         mRouteInfoSize = 0
 
         if (FunctionBuildConfig.isDemoMode) {
-            tbIsDemoMode.text = "关闭美化模式"
+            tbIsDemoMode?.text = "关闭美化模式"
         } else {
-            tbIsDemoMode.text = "开启美化模式"
+            tbIsDemoMode?.text = "开启美化模式"
         }
-
         //obu信息，排查obu相关问题使用
         tvObuInfoContent.text = mObuInfoStr
 
@@ -2035,6 +2045,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()
     }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt

@@ -141,7 +141,12 @@ class SystemVersionView @JvmOverloads constructor(
             }
         }
 
-        updateHDDataCacheStatus(CallerMapUIServiceManager.isCityDataCached())
+        ThreadUtils.getIoPool().execute {
+            val isCached = CallerMapUIServiceManager.isCityDataCached()
+            UiThreadHandler.post {
+                updateHDDataCacheStatus(isCached)
+            }
+        }
 
         if(AdUpgradeStateHelper.isConfirmUpgrade()){
             //将角标改为“下载中”

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"