Merge remote-tracking branch 'origin/dev_MogoAP_eagle-220_211207_8.0.17_merge' into dev_MogoAP_eagle-220_211207_8.0.17_merge

2022-02-24 17:47:38 +08:00
parent 353e8492b9 4ffcbc977f
commit 2bc36e11aa
16 changed files with 239 additions and 36 deletions
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt
@@ -9,9 +9,11 @@ import com.mogo.eagle.core.data.chain.ChainConstant.Companion.CHAIN_LINK_LOG_ADA
 import com.mogo.eagle.core.data.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CONNECT_STATUS
 import com.mogo.eagle.core.data.chain.ChainConstant.Companion.CHAIN_LINK_LOG_WEB_SOCKET_DATA
 import com.mogo.eagle.core.data.chain.ChainLogParam
+import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.api.devatools.IDevaToolsProvider
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
 import com.mogo.eagle.core.utilcode.util.Utils
 import com.zhidao.loglib.fw.FileWriteManager
@@ -30,13 +32,37 @@ class DevaToolsProvider : IDevaToolsProvider {

    override fun init(context: Context) {
        MogoLogCatchManager.init(context)
+        logCheck(context)
        initTrace(context)
    }

+    private fun logCheck(context: Context) {
+        val logger = SharedPrefsMgr.getInstance(context).getBoolean(MoGoConfig.CATCH_LOG, false)
+        val loggerTime = SharedPrefsMgr.getInstance(context).getLong(MoGoConfig.CATCH_LOG_TIME, 0)
+        val logCatchDuration = (System.currentTimeMillis() - loggerTime) / 1000 / 60
+        if (logger && loggerTime > 0) {
+            val logTime: Int = if (10 - logCatchDuration < 1) {
+                1
+            } else {
+                10 - logCatchDuration.toInt()
+            }
+            MogoLogCatchManager.startCatchLog(logTime)
+        } else {
+            Logger.d(
+                functionName,
+                "logCheck logger : $logger , logCatchDuration : $logCatchDuration"
+            )
+        }
+    }
+
    override fun startLogCatch() {
        MogoLogCatchManager.startCatchLog()
    }

+    override fun startLogCatch(duration: Int) {
+        MogoLogCatchManager.startCatchLog(duration)
+    }
+
    override fun stopLogCatch() {
        MogoLogCatchManager.stopCatchLog()
    }
@@ -52,8 +78,8 @@ class DevaToolsProvider : IDevaToolsProvider {
        fwBuildMap[CHAIN_LINK_LOG_WEB_SOCKET_DATA] =
            FwBuild(false, pkgName + CHAIN_LINK_LOG_ADAS_MSG, 500)

-        traceInfoCache[CHAIN_LINK_LOG_CONNECT_STATUS] = ChainLogParam(true,"ADAS连接状态")
-        traceInfoCache[CHAIN_LINK_LOG_WEB_SOCKET_DATA] = ChainLogParam(false,"ADAS长链数据")
+        traceInfoCache[CHAIN_LINK_LOG_CONNECT_STATUS] = ChainLogParam(true, "ADAS连接状态")
+        traceInfoCache[CHAIN_LINK_LOG_WEB_SOCKET_DATA] = ChainLogParam(false, "ADAS长链数据")
        FileWriteManager.getInstance()
            .init(context, MoGoAiCloudClientConfig.getInstance().sn, pkgName, fwBuildMap)
    }
@@ -67,7 +93,7 @@ class DevaToolsProvider : IDevaToolsProvider {
        map.forEach { (type, param) ->
            val fwBuild = this.fwBuildMap[type]
            fwBuild?.let {
-                Logger.d(functionName,"param : ${param.des} , record : ${param.record}")
+                Logger.d(functionName, "param : ${param.des} , record : ${param.record}")
                it.isRecord = param.record
            }
        }
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt
@@ -7,10 +7,12 @@ import android.os.Message
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.debug.DebugConfig
+import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
 import com.mogo.eagle.core.network.NetConfig
 import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.module.common.MogoApisHandler
@@ -45,7 +47,6 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
        MogoApisHandler.getInstance().apis
            .getSocketManagerApi(AbsMogoApplication.getApp().applicationContext)
            .registerOnMessageListener(LOG_PUSH_TYPE, this)
-        manualContent.duration = 10
        manualContent.pkgName = context.packageName
    }

@@ -78,12 +79,13 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
        return false
    }

-    fun startCatchLog() {
+    fun startCatchLog(duration:Int = 10) {
        if (catchingList.contains(MANUAL_CATCH_PKG_NAME)) {
            TipToast.shortTip("已经在抓取日志了,请稍后再试")
        } else {
-            Logger.d(TAG, "开始抓取日志====")
+            Logger.d(TAG, "开始抓取日志==== duration : $duration")
            manualContent.type = START_CATCH_LOG
+            manualContent.duration = duration
            startCatchLog(manualContent)
        }
    }
@@ -99,21 +101,28 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
        var delay = (content.duration).toLong()
        handler.removeMessages(MSG_TRY_CLOSE_LOG)
        if (delay <= 0) {
-            // 如果push 下来的delay小于等于0，那就给个默认最大值一小时
+            // 如果push 下来的delay小于等于0，那就给个默认值
            delay = 10
        }
        handler.sendEmptyMessageDelayed(MSG_TRY_CLOSE_LOG, delay * 1000L * 60)
+
        openLoggerLevel()
+
        logInfoManager = LogInfoManagerFactory.createPushLogInfoManager(
            mContext,
            MoGoAiCloudClientConfig.getInstance().sn,
            content,
            this
        )
+
        logInfoManager?.start()
        logInfoManager?.registerLogOutListener { lineLog ->
            CallerDevaToolsListenerManager.invokeDevaToolsLogCatchLines(lineLog)
        }
+
+        SharedPrefsMgr.getInstance(mContext!!).putBoolean(MoGoConfig.CATCH_LOG, true)
+        SharedPrefsMgr.getInstance(mContext!!)
+            .putLong(MoGoConfig.CATCH_LOG_TIME, System.currentTimeMillis())
    }

    private fun stopCatchLog(content: RemoteLogPushContent) {
@@ -124,6 +133,9 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
        logInfoManager?.stop()
        logInfoManager = null
        closeLoggerLevel()
+
+        SharedPrefsMgr.getInstance(mContext!!).putBoolean(MoGoConfig.CATCH_LOG, false)
+        SharedPrefsMgr.getInstance(mContext!!).putLong(MoGoConfig.CATCH_LOG_TIME, 0)
    }

    /**
@@ -151,6 +163,10 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl

    override fun onClose(pkgName: String?) {
        ThreadUtils.runOnUiThread {
+
+            SharedPrefsMgr.getInstance(mContext!!).putBoolean(MoGoConfig.CATCH_LOG, false)
+            SharedPrefsMgr.getInstance(mContext!!).putLong(MoGoConfig.CATCH_LOG_TIME, 0)
+
            CallerDevaToolsListenerManager.invokeDevaToolsLogCatchClose()
            TipToast.shortTip("日志抓取默认计时结束")
        }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -36,11 +36,20 @@ import com.mogo.eagle.core.function.call.obu.CallerObuListenerManager
 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.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.map.MogoMap
+import com.mogo.map.uicontroller.VisualAngleMode
+import com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_300
+import com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS
+import com.mogo.map.uicontroller.VisualAngleMode.MAP_STYLE_VR_ANGLE_TOP
+import com.mogo.map.uicontroller.VisualAngleMode.MODE_CLOSE_SIGHT
+import com.mogo.map.uicontroller.VisualAngleMode.MODE_LONG_SIGHT
+import com.mogo.map.uicontroller.VisualAngleMode.MODE_MEDIUM_SIGHT
+import com.mogo.module.common.MogoApisHandler
 import kotlinx.android.synthetic.main.view_debug_setting.view.*
 import java.util.*

@@ -55,9 +64,9 @@ class DebugSettingView @JvmOverloads constructor(
    attrs: AttributeSet? = null,
    defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoObuStatusListener,
-        IMoGoAutopilotStatusListener, IMoGoAutopilotCarStateListener,
-        IMoGoMapLocationListener, IMoGoAutopilotIdentifyListener,
-        IMoGoAutopilotPlanningListener {
+    IMoGoAutopilotStatusListener, IMoGoAutopilotCarStateListener,
+    IMoGoMapLocationListener, IMoGoAutopilotIdentifyListener,
+    IMoGoAutopilotPlanningListener {

    private val TAG = "DebugSettingView"

@@ -76,6 +85,12 @@ class DebugSettingView @JvmOverloads constructor(
    // 全局路径规划点个数
    private var mRouteInfoSize = 0

+    private val mapUiController by lazy {
+        MogoApisHandler.getInstance().apis?.mapServiceApi?.mapUIController
+    }
+
+    private var lastVisualAngleMode: VisualAngleMode? = null
+
    init {
        LayoutInflater.from(context).inflate(R.layout.view_debug_setting, this, true)
        initView()
@@ -205,10 +220,29 @@ class DebugSettingView @JvmOverloads constructor(
            }
        }

-        changesight_top_btn.setOnClickListener {
-            CallerHDMapManager.setMapDAngle(0);
+        lastVisualAngleMode = mapUiController?.currentMapVisualAngle
+
+        changesight_top_btn.onClick {
+            mapUiController?.changeMapVisualAngle(MAP_STYLE_VR_ANGLE_TOP, null)
        }

+        changesight_back_btn?.onClick {
+            mapUiController?.changeMapVisualAngle(MAP_STYLE_VR_ANGLE_300, null)
+        }
+
+        changesight_cross_btn?.onClick {
+            mapUiController?.changeMapVisualAngle(MAP_STYLE_VR_ANGLE_CROSS, null)
+        }
+
+        changesight_far_btn?.onClick {
+            mapUiController?.changeMapVisualAngle(MODE_LONG_SIGHT, null)
+        }
+
+        reset_changesight?.onClick {
+            lastVisualAngleMode?.let {
+                mapUiController?.changeMapVisualAngle(it, null)
+            }
+        }

        tvObuInfo.text = CallerObuListenerManager.getObuStatusInfoJsonString()
        tvAutopilotInfo.text =
@@ -355,10 +389,8 @@ class DebugSettingView @JvmOverloads constructor(
        tbLogCatch.setOnCheckedChangeListener { _, isChecked ->
            if (isChecked) {
                CallerDevaToolsManager.startCatchLog()
-                SharedPrefsMgr.getInstance(context).putBoolean(MoGoConfig.CATCH_LOG, true)
            } else {
                CallerDevaToolsManager.stopCatchLog()
-                SharedPrefsMgr.getInstance(context).putBoolean(MoGoConfig.CATCH_LOG, false)
            }
        }
        CallerDevaToolsListenerManager.registerDevaToolsLogCatchListener(TAG,
@@ -438,15 +470,15 @@ class DebugSettingView @JvmOverloads constructor(
        tvAutopilotInfo.text = GsonUtils.toJson(mAutoPilotStatusInfo)

        tvCarInfo.text =
-                "GPS时间：${mAutoPilotCarStateInfo?.values?.satelliteTime}\n" +
-                        "自车经纬度：\n${mAutoPilotCarStateInfo?.values?.lon}\n${mAutoPilotCarStateInfo?.values?.lat}\n"
+            "GPS时间：${mAutoPilotCarStateInfo?.values?.satelliteTime}\n" +
+                    "自车经纬度：\n${mAutoPilotCarStateInfo?.values?.lon}\n${mAutoPilotCarStateInfo?.values?.lat}\n"

        tvIdentifyInfo.text =
-                "感知数据个数：${mIdentifyDataSize}"
+            "感知数据个数：${mIdentifyDataSize}"
        tvTrajectoryInfoSize.text =
-                "引导线点个数：${mTrajectoryInfoSize}"
+            "引导线点个数：${mTrajectoryInfoSize}"
        tvRouteInfoSize.text =
-                "全局路径规划点个数：${mRouteInfoSize}"
+            "全局路径规划点个数：${mRouteInfoSize}"

        // 用完之后重制为0，防止节点回掉突然没数据，导致页面显示还是之前的数据情况
        mIdentifyDataSize = 0