merge

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt

@@ -4,11 +4,11 @@ import android.annotation.SuppressLint
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ADAS_IMPL
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.autopilot.network.AdasServiceModel
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_ADAS_IMPL
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.zhidao.support.adas.high.AdasManager
 import com.zhidao.support.adas.high.OnAdasConnectStatusListener
@@ -32,10 +32,12 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener,
     //自动驾驶车速度
     private var mCurrentAutopilotSpeed = 0f
 
+    private var connectStatus = false
 
     override fun onConnectionIPCStatus(ipcConnectionStatus: Int, reason: String?) {
         if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.CONNECTED) {
             CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 连接成功")
+            connectStatus = true
             // 初始化自动驾驶状态信息
             CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP =
                 AdasManager.getInstance().ipcConnectedIp
@@ -49,10 +51,12 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener,
 
         } else if (ipcConnectionStatus == Constants.IPC_CONNECTION_STATUS.DISCONNECTED) {
             CallerLogger.d("$M_ADAS_IMPL$TAG", "webSocket 连接失败 reason:$reason")
-//            TODO 需要修改断开提示
-//            reason?.let {
-//                TipToast.shortTip("工控机连接断开，原因:$it , 等待重连")
-//            }
+            if (connectStatus) {
+                reason?.let {
+                    TipToast.shortTip("工控机连接断开，原因:$it , 等待重连")
+                }
+                connectStatus = false
+            }
             CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectIP =
                 AdasManager.getInstance().ipcConnectedIp
             CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().connectStatus = false

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt

@@ -44,6 +44,10 @@ class DevaToolsProvider : IDevaToolsProvider {
         MogoLogCatchManager.stopCatchLog(logPrefixName)
     }
 
+    override fun setTraceLogEnable(enable: Boolean) {
+        traceManager.setTraceLogEnable(enable)
+    }
+
     override fun getTraceInfo(): HashMap<Int, ChainLogParam> {
         return traceManager.getTraceInfo()
     }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt

@@ -156,6 +156,7 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
             MoGoAiCloudClientConfig.getInstance().sn,
             AppConfigInfo.toString(),
             logPrefixName?.replace("_", "-"),
+            null,
             content,
             this
         )

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt

@@ -58,6 +58,10 @@ class TraceManager {
             .init(context, MoGoAiCloudClientConfig.getInstance().sn, pkgName, fwBuildMap)
     }
 
+    fun setTraceLogEnable(enable:Boolean){
+        FileWriteManager.getInstance().setLogger(enable)
+    }
+
     fun getTraceInfo(): HashMap<Int, ChainLogParam> {
         return traceInfoCache
     }

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

@@ -1006,7 +1006,10 @@ class DebugSettingView @JvmOverloads constructor(
             }
         }
 
-
+        //链路Log输出日志
+        cbTraceLog.setOnCheckedChangeListener { _, isChecked ->
+            CallerDevaToolsManager.setTraceLogEnable(isChecked)
+        }
         //ADAS日志标签
         cbAdasLog.setOnCheckedChangeListener { _, isChecked ->
             val adasModule = SceneModule(isChecked, SceneConstant.M_ADAS_IMPL)

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

@@ -1427,6 +1427,14 @@
                     app:justifyContent="flex_start"
                     tools:visibility="visible">
 
+                    <CheckBox
+                        android:id="@+id/cbTraceLog"
+                        style="@style/DebugSettingText"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:checked="true"
+                        android:text="链路日志" />
+
                     <CheckBox
                         android:id="@+id/cbAdasLog"
                         style="@style/DebugSettingText"