[3.3.0] reset log tag

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

@@ -4,9 +4,6 @@ import android.content.Context
 import android.text.TextUtils
 import android.util.*
 import android.view.*
-import android.view.ViewGroup.LayoutParams
-import android.widget.FrameLayout
-import androidx.core.view.*
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -23,7 +20,6 @@ import com.mogo.eagle.core.data.enums.WarningDirectionEnum
 import com.mogo.eagle.core.data.map.Infrastructure
 import com.mogo.eagle.core.data.biz.notice.NoticeNormalData
 import com.mogo.eagle.core.data.biz.notice.NoticeTrafficStylePushData
-import com.mogo.eagle.core.data.status.StatusSummaryEntity
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoHmiProvider
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.call.hmi.*
@@ -45,13 +41,11 @@ import com.mogo.eagle.core.utilcode.floating.*
 import com.mogo.eagle.core.utilcode.kotlin.safeCancel
 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.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.eagle.core.utilcode.util.*
 import com.zhjt.service_biz.BizConfig
 import kotlinx.coroutines.*
 import kotlinx.coroutines.selects.*
-import java.lang.ref.WeakReference
 import java.util.concurrent.atomic.AtomicReference
 
 /**
@@ -125,7 +119,7 @@ class MoGoHmiProvider : IMoGoHmiProvider {
                 ttsMap[v2xType] = System.currentTimeMillis()
             }
         }
-        CallerLogger.d("${SceneConstant.M_OBU}${TAG}", "warningV2X v2xType = $v2xType ---alertContent = $alertContent ---ttsContent = $ttsContent ")
+        CallerLogger.d("${M_HMI}${TAG}", "warningV2X v2xType = $v2xType ---alertContent = $alertContent ---ttsContent = $ttsContent ")
         val playTTS = !AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)
         context?.let {
             val warningContent = alertContent ?: EventTypeEnumNew.getWarningContent(v2xType)

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

@@ -1200,9 +1200,7 @@ internal class DebugSettingView @JvmOverloads constructor(
                 val log = map.value.log
                 when (name) {
                     //ADAS日志标签
-                    SceneConstant.M_ADAS_IMPL -> cbAdasLog.isChecked = log
-                    //CALLCHAT日志标签
-                    SceneConstant.M_CHAT -> cbCallChatLog.isChecked = log
+                    SceneConstant.M_D_C -> cbAdasLog.isChecked = log
                     //OBU日志标签
                     SceneConstant.M_OBU -> cbObuLog.isChecked = log
                     //HMI日志标签
@@ -1215,8 +1213,6 @@ internal class DebugSettingView @JvmOverloads constructor(
                     SceneConstant.M_DEVA -> cbDevaLog.isChecked = log
                     //网络模块日志标签
                     SceneConstant.M_NETWORK -> cbNetworkLog.isChecked = log
-                    //ROUTE日志标签
-                    SceneConstant.M_OLD_ROUTE -> cbOldRouteLog.isChecked = log
                     //BUS日志标签
                     SceneConstant.M_BUS -> cbBusLog.isChecked = log
                     //TAXI日志标签
@@ -1225,8 +1221,6 @@ internal class DebugSettingView @JvmOverloads constructor(
                     SceneConstant.M_TAXI_P -> cbTaxiPLog.isChecked = log
                     //清扫车日志
                     SceneConstant.M_SWEEPER -> cbSweeperPLog.isChecked = log
-                    //其他模块日志(暂未区分具体模块)
-                    SceneConstant.M_OTHER -> cbOtherLog.isChecked = log
                 }
             }
         }
@@ -1285,14 +1279,8 @@ internal class DebugSettingView @JvmOverloads constructor(
         }
         //ADAS日志标签
         cbAdasLog.setOnCheckedChangeListener { _, isChecked ->
-            val adasModule = SceneModule(isChecked, SceneConstant.M_ADAS_IMPL)
-            sceneMap[SceneConstant.M_ADAS_IMPL] = adasModule
-            CallerDevaToolsManager.updateModuleTAG(sceneMap)
-        }
-        //CALLCHAT日志标签
-        cbCallChatLog.setOnCheckedChangeListener { _, isChecked ->
-            val callChatModule = SceneModule(isChecked, SceneConstant.M_CHAT)
-            sceneMap[SceneConstant.M_CHAT] = callChatModule
+            val adasModule = SceneModule(isChecked, SceneConstant.M_D_C)
+            sceneMap[SceneConstant.M_D_C] = adasModule
             CallerDevaToolsManager.updateModuleTAG(sceneMap)
         }
         //OBU日志标签
@@ -1331,12 +1319,6 @@ internal class DebugSettingView @JvmOverloads constructor(
             sceneMap[SceneConstant.M_NETWORK] = networkModule
             CallerDevaToolsManager.updateModuleTAG(sceneMap)
         }
-        //ROUTE日志标签
-        cbOldRouteLog.setOnCheckedChangeListener { _, isChecked ->
-            val oldRouteModule = SceneModule(isChecked, SceneConstant.M_OLD_ROUTE)
-            sceneMap[SceneConstant.M_OLD_ROUTE] = oldRouteModule
-            CallerDevaToolsManager.updateModuleTAG(sceneMap)
-        }
         //BUS日志标签
         cbBusLog.setOnCheckedChangeListener { _, isChecked ->
             val busModule = SceneModule(isChecked, SceneConstant.M_BUS)
@@ -1361,13 +1343,6 @@ internal class DebugSettingView @JvmOverloads constructor(
             sceneMap[SceneConstant.M_SWEEPER] = sweeperModule
             CallerDevaToolsManager.updateModuleTAG(sceneMap)
         }
-        //其他未分类模块日志
-        cbOtherLog.setOnCheckedChangeListener { _, isChecked ->
-            val otherModule = SceneModule(isChecked, SceneConstant.M_OTHER)
-            sceneMap[SceneConstant.M_OTHER] = otherModule
-            CallerDevaToolsManager.updateModuleTAG(sceneMap)
-        }
-
         //开始停止抓取全量日志
         tbLogCatch.isChecked =
             SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.CATCH_LOG, false)

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

@@ -2127,14 +2127,6 @@
                         android:checked="false"
                         android:text="ADAS日志" />
 
-                    <CheckBox
-                        android:id="@+id/cbCallChatLog"
-                        style="@style/DebugSettingText"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:checked="false"
-                        android:text="CallChat日志" />
-
                     <CheckBox
                         android:id="@+id/cbObuLog"
                         style="@style/DebugSettingText"
@@ -2183,14 +2175,6 @@
                         android:checked="false"
                         android:text="网络模块日志" />
 
-                    <CheckBox
-                        android:id="@+id/cbOldRouteLog"
-                        style="@style/DebugSettingText"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:checked="false"
-                        android:text="ROUTE日志" />
-
                     <CheckBox
                         android:id="@+id/cbBusLog"
                         style="@style/DebugSettingText"
@@ -2222,14 +2206,6 @@
                         android:checked="false"
                         android:text="清扫车日志" />
 
-                    <CheckBox
-                        android:id="@+id/cbOtherLog"
-                        style="@style/DebugSettingText"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:checked="false"
-                        android:text="其他模块日志" />
-
                 </com.google.android.flexbox.FlexboxLayout>
 
                 <LinearLayout