[6.0.0] open deva_module log

2023-08-24 14:17:30 +08:00
parent 78dbc3cf69
commit 61c49bace7
4 changed files with 19 additions and 18 deletions
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt
@@ -3,7 +3,6 @@ package com.zhjt.mogo_core_function_devatools.binding
 import android.annotation.*
 import android.content.Context
 import android.text.TextUtils
-import android.util.*
 import com.elegant.utils.UiThreadHandler
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.constants.SharedPrefsConstants
@@ -18,7 +17,7 @@ import com.mogo.eagle.core.function.call.obu.CallerObuApiManager
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isDriver
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils.isPassenger
 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_DEVA
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.zhjt.mogo_core_function_devatools.upgrade.IPCUpgradeManager.Companion.ipcUpgradeManager
 import com.zhjt.mogo_core_function_devatools.upgrade.ObuUpgradeAppNetWorkManager
@@ -61,9 +60,9 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener {
    }

    override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
-        CallerLogger.d("${SceneConstant.M_DEVA}${TAG}", "onAutopilotCarConfig ----------> ")
+        CallerLogger.d("${M_DEVA}${TAG}", "onAutopilotCarConfig ----------> ")
        if (!TextUtils.isEmpty(carConfigResp.macAddress)) {
-            CallerLogger.d("${SceneConstant.M_DEVA}${TAG}",
+            CallerLogger.d("${M_DEVA}${TAG}",
                "onAutopilotCarConfig carConfigResp.macAddress = ${carConfigResp.macAddress} ")
            getBindingCarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn)
        }
@@ -89,7 +88,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener {
                queryObuUpgrade(obuVersion)
            }
        }
-        CallerLogger.d("${SceneConstant.M_DEVA}${TAG}",
+        CallerLogger.d("${M_DEVA}${TAG}",
            "getBindingcarInfo macAddress = $macAddress--widevineIDWithMd5 = $widevineIDWithMd5 ---screenType = $screenType"
        )
        SharedPrefsMgr.getInstance(mContext!!).putString(SharedPrefsConstants.APP_MAC, macAddress)
@@ -179,10 +178,10 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener {
     * 查询app是否需要升级
     */
    fun queryAppUpgrade() {
-        Log.d("UPGRADE", "----  1 ----")
+        CallerLogger.d(M_DEVA+"UPGRADE", "----  1 ----")
        var macAddress = mAddress
        if (TextUtils.isEmpty(macAddress)) {
-            Log.d("UPGRADE", "----  2 ----")
+            CallerLogger.d(M_DEVA+"UPGRADE", "----  2 ----")
            macAddress = SharedPrefsMgr.getInstance(mContext!!)
                .getString(SharedPrefsConstants.APP_MAC)
        }
@@ -190,7 +189,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener {
            if (!TextUtils.equals(macAddress, mAddress)) {
                mAddress = macAddress
            }
-            Log.d("UPGRADE", "----  3 ----[mac: $macAddress]")
+            CallerLogger.d(M_DEVA+"UPGRADE", "----  3 ----[mac: $macAddress]")
            UpgradeAppNetWorkManager.instance
                ?.getAppUpgradeInfo(mContext, macAddress, role.toString() + "")
        }
@@ -202,9 +201,9 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener {
     */
    fun queryObuUpgrade(obuVersionName: String) {
        mObuVersion = obuVersionName
-        CallerLogger.d("${SceneConstant.M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}", "screenType = $screenType ----role = $role")
+        CallerLogger.d("${M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}", "screenType = $screenType ----role = $role")
        if (screenType == 1) {
-            CallerLogger.d("${SceneConstant.M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}","queryObuUpgrade isConnected =  ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress")
+            CallerLogger.d("${M_DEVA}${MogoObuConst.TAG_UPGRADE_OBU}","queryObuUpgrade isConnected =  ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress")
            ObuUpgradeAppNetWorkManager.instance?.getObuUpgradeInfo(if(!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(mContext!!).getString(SharedPrefsConstants.APP_MAC), obuVersionName)
        }
    }
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt
@@ -19,6 +19,8 @@ import com.mogo.core.mofang.connect.listener.*
 import com.mogo.eagle.core.function.api.devatools.mofang.*
 import com.mogo.eagle.core.function.api.devatools.mofang.IMoGoMoFangProvider.OnMoFangStatusListener
 import com.mogo.eagle.core.utilcode.floating.*
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.util.*
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_BATTERY
 import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_BATTERY_VALUE
@@ -266,7 +268,7 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen
    override fun onBluetoothKeyboardEvent(event: KeyEvent) { }

    override fun onBluetoothKeyboardInputInvalid() {
-        Log.d(TAG, "--- onBluetoothKeyboardInputInvalid ---")
+       CallerLogger.d(M_DEVA+TAG, "--- onBluetoothKeyboardInputInvalid ---")
        MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_IS_INVALID to "${System.currentTimeMillis()}"))
        linkedLog.record(mapOf("callback" to "onBluetoothKeyboardInputInvalid"))
        UiThreadHandler.post {
@@ -277,25 +279,25 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen
    }

    override fun onBluetoothKeyboardInputValid() {
-        Log.d(TAG, "--- onBluetoothKeyboardInputValid ---")
+       CallerLogger.d(M_DEVA+TAG, "--- onBluetoothKeyboardInputValid ---")
        MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_IS_VALID to "${System.currentTimeMillis()}"))
        linkedLog.record(mapOf("callback" to "onBluetoothKeyboardInputValid"))
    }

    override fun onBluetoothOpenAgreed() {
-        Log.d(TAG, "--- onBluetoothOpenAgreed ---")
+       CallerLogger.d(M_DEVA+TAG, "--- onBluetoothOpenAgreed ---")
        MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_BLUETOOTH_OPEN_AGREE to "${System.currentTimeMillis()}"))
        linkedLog.record(mapOf("callback" to "onBluetoothOpenAgreed"))
    }

    override fun onBluetoothOpenDenied() {
-        Log.d(TAG, "--- onBluetoothOpenDenied ---")
+       CallerLogger.d(M_DEVA+TAG, "--- onBluetoothOpenDenied ---")
        MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_BLUETOOTH_OPEN_DENY to "${System.currentTimeMillis()}"))
        linkedLog.record(mapOf("callback" to "onBluetoothOpenDenied"))
    }

    override fun onBluetoothSettingRequest() {
-        Log.d(TAG, "--- onBluetoothSettingRequest ---")
+       CallerLogger.d(M_DEVA+TAG, "--- onBluetoothSettingRequest ---")
        MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_BLUETOOTH_SETTING_REQ to "${System.currentTimeMillis()}"))
        linkedLog.record(mapOf("callback" to "onBluetoothSettingRequest"))
        UiThreadHandler.post {
@@ -304,7 +306,7 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen
    }

    override fun onBluetoothKeyboardAbnormalDisconnected(status: Int) {
-        Log.d(TAG, "--- onBluetoothKeyboardAbnormalDisconnected(status: $status) ---")
+       CallerLogger.d(M_DEVA+TAG, "--- onBluetoothKeyboardAbnormalDisconnected(status: $status) ---")
        MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_DISCONNECT_SLEEP to "${System.currentTimeMillis()}"))
        linkedLog.record(mapOf("callback" to "onBluetoothKeyboardAbnormalDisconnected:$status"))
    }
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/scene/SceneManager.kt
@@ -48,7 +48,7 @@ class SceneManager {
    init {
        //过滤所需条件
        sceneModuleTAG.map[ADAS] = SceneModule(true, M_D_C)
-        sceneModuleTAG.map[DEVA] = SceneModule(false, M_DEVA)
+        sceneModuleTAG.map[DEVA] = SceneModule(true, M_DEVA)
        sceneModuleTAG.map[HMI] = SceneModule(false, M_HMI)
        sceneModuleTAG.map[OBU] = SceneModule(true, M_OBU)
        sceneModuleTAG.map[V2X] = SceneModule(true, M_V2X)