[6.2.6] sp opt , update aicloud upload loc thread

2024-01-03 16:31:29 +08:00
parent 74824c1eba
commit 6729fe50af
135 changed files with 649 additions and 792 deletions
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
@@ -13,10 +13,10 @@ import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Lifecycle.Event
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.module.status.IMogoStatusChangedListener
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.commons.module.status.StatusDescriptor
+import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.deva.report.ReportEntity
@@ -374,7 +374,7 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis
                    recordPanel.key.toString(), recordPanel.filename,
                    System.currentTimeMillis().toString(), recordPanel.stat.toString(),
                    AppConfigInfo.plateNumber, recordPanel.duration.toString(),
-                    MoGoAiCloudClientConfig.getInstance().sn, BadCaseConfig.dockerVersion ?: "",
+                    SharedPrefsMgr.getInstance().sn, BadCaseConfig.dockerVersion ?: "",
                    AppUtils.getAppVersionName(), lat.toString(), lon.toString()
                )
                //日志埋点
@@ -382,7 +382,7 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis
                    "$M_DEVA$TAG",
                    "BadCase Receive Analytics=" + "key=" + recordPanel.key + " filename=" + recordPanel.filename +
                            " receiveTime=" + System.currentTimeMillis() + " stat=" + recordPanel.stat + " plateNumber=" + AppConfigInfo.plateNumber +
-                            " totalDuration=" + recordPanel.duration + " carSn=" + MoGoAiCloudClientConfig.getInstance().sn + " mapVersion=" + BadCaseConfig.dockerVersion +
+                            " totalDuration=" + recordPanel.duration + " carSn=" + SharedPrefsMgr.getInstance().sn + " mapVersion=" + BadCaseConfig.dockerVersion +
                            " eyeVersion=" + AppUtils.getAppVersionName() + " latitude=" + lat + " longitude=" + lon
                )
            }
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/AIDataCollectWindow.kt
@@ -9,7 +9,7 @@ import android.view.*
 import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig
+import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.deva.badcase.AiDataEntity
 import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity
@@ -186,7 +186,7 @@ class AIDataCollectWindow constructor(activity: Activity) : View.OnTouchListener
                    itx["duration"] = "20" //采集时长，固定为20S
                    itx["startTime"] = System.currentTimeMillis().toString() //上报时间(时间戳格式)
                    itx["channel"] = "AI" //渠道
-                    itx["carSn"] = MoGoAiCloudClientConfig.getInstance().sn //SN
+                    itx["carSn"] = SharedPrefsMgr.getInstance().sn //SN
                    itx["userRole"] = "" //采集者角色
                    itx["audioUrl"] = "" //音频COS地址
                    itx["mapVersion"] = BadCaseConfig.dockerVersion ?: "" //工控机版本
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/InitiativeBadCaseWindow.kt
@@ -24,8 +24,8 @@ import com.iflytek.cloud.RecognizerListener
 import com.iflytek.cloud.RecognizerResult
 import com.iflytek.cloud.SpeechError
 import com.iflytek.cloud.SpeechRecognizer
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.debug.DebugConfig
+import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity
 import com.mogo.eagle.core.data.deva.badcase.BagInfoEntity
@@ -372,7 +372,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
        if(file.exists()){
            isUploadCos = true
            LogInfoManagerFactory.createAudioUpload(mActivity.applicationContext,DebugConfig.isDebug(),
-                TAG, MoGoAiCloudClientConfig.getInstance().sn,singlePath,
+                TAG, SharedPrefsMgr.getInstance().sn,singlePath,
                object : OnUploadListener {
                    override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String?) {
                        if(downloadUrl == null){
@@ -441,7 +441,7 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
                itx["duration"] = BadCaseConfig.totalDuration.toString() //采集时长，固定为20S
                itx["startTime"] = System.currentTimeMillis().toString() //上报时间(时间戳格式)
                itx["channel"] = "1" //渠道
-                itx["carSn"] = MoGoAiCloudClientConfig.getInstance().sn //SN
+                itx["carSn"] = SharedPrefsMgr.getInstance().sn //SN
                itx["userRole"] = BadCaseConfig.identity //采集者角色
                itx["audioUrl"] = downloadUrl?:"" //音频COS地址
                itx["mapVersion"] = BadCaseConfig.dockerVersion ?:"" //工控机版本
@@ -470,13 +470,13 @@ class InitiativeBadCaseWindow constructor(activity: Activity) : View.OnTouchList
                }
                val loc = getChassisLocationWGS84()
                BadCaseAnalyticsManager.bagRecordUpload(recordKey.toString(),recordFileName?:"",uploadStamp,
-                    "100",AppConfigInfo.plateNumber,BadCaseConfig.totalDuration.toString(),MoGoAiCloudClientConfig.getInstance().sn,
+                    "100",AppConfigInfo.plateNumber,BadCaseConfig.totalDuration.toString(),SharedPrefsMgr.getInstance().sn,
                    BadCaseConfig.dockerVersion ?:"",AppUtils.getAppVersionName(),loc.latitude.toString(),loc.longitude.toString(),
                    BadCaseConfig.identity,downloadUrl?:"",uploadReasonTotal,System.currentTimeMillis().toString(),"1")
                //日志
                CallerLogger.i("$M_DEVA$TAG", "BadCase Initiative Analytics="+"key="+recordKey+" filename="+recordFileName+
                        " receiveTime="+uploadStamp+" stat="+"100"+" plateNumber="+AppConfigInfo.plateNumber+
-                        " totalDuration="+ BadCaseConfig.totalDuration +" carSn="+MoGoAiCloudClientConfig.getInstance().sn+" mapVersion="+BadCaseConfig.dockerVersion+
+                        " totalDuration="+ BadCaseConfig.totalDuration +" carSn="+SharedPrefsMgr.getInstance().sn+" mapVersion="+BadCaseConfig.dockerVersion+
                        " eyeVersion="+AppUtils.getAppVersionName()+" latitude="+ loc.latitude +" longitude="+ loc.longitude+
                        " identity="+BadCaseConfig.identity + " downloadUrl="+downloadUrl +" uploadReason="+uploadReasonTotal+
                        " uploadTime="+System.currentTimeMillis()+" channel="+"1")
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/biz/PassiveBadCaseWindow.kt
@@ -23,8 +23,8 @@ import com.iflytek.cloud.RecognizerListener
 import com.iflytek.cloud.RecognizerResult
 import com.iflytek.cloud.SpeechError
 import com.iflytek.cloud.SpeechRecognizer
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.debug.DebugConfig
+import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.app.AppConfigInfo
 import com.mogo.eagle.core.data.deva.badcase.BagDescriptionEntity
 import com.mogo.eagle.core.data.deva.badcase.BagManagerEntity
@@ -371,7 +371,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
        if(file.exists()){
            isUploadCos = true
            LogInfoManagerFactory.createAudioUpload(mActivity.applicationContext, DebugConfig.isDebug(),
-                TAG, MoGoAiCloudClientConfig.getInstance().sn,singlePath,
+                TAG, SharedPrefsMgr.getInstance().sn,singlePath,
                object : OnUploadListener {
                    override fun onUploadSuccess(key: String, filePath: String, downloadUrl: String?) {
                        if(downloadUrl == null){
@@ -441,7 +441,7 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
                itx["duration"] = BadCaseConfig.totalDuration.toString() //采集时长，固定为20S
                itx["startTime"] = System.currentTimeMillis().toString() //上报时间(时间戳格式)
                itx["channel"] = "0" //渠道
-                itx["carSn"] = MoGoAiCloudClientConfig.getInstance().sn //SN
+                itx["carSn"] = SharedPrefsMgr.getInstance().sn //SN
                itx["userRole"] = BadCaseConfig.identity //采集者角色
                itx["audioUrl"] = downloadUrl?:"" //音频COS地址
                itx["mapVersion"] = BadCaseConfig.dockerVersion ?:"" //工控机版本
@@ -472,13 +472,13 @@ class PassiveBadCaseWindow constructor(activity: Activity) : View.OnTouchListene
                //被动上报埋点统计
                val loc = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
                BadCaseAnalyticsManager.bagRecordUpload(recordKey?:"",recordFileName?:"",receiveTime?:System.currentTimeMillis().toString(),
-                    stat,AppConfigInfo.plateNumber,BadCaseConfig.totalDuration.toString(),MoGoAiCloudClientConfig.getInstance().sn,
+                    stat,AppConfigInfo.plateNumber,BadCaseConfig.totalDuration.toString(),SharedPrefsMgr.getInstance().sn,
                    BadCaseConfig.dockerVersion ?:"",AppUtils.getAppVersionName(),loc.latitude.toString(),loc.longitude.toString(),
                    BadCaseConfig.identity,downloadUrl?:"",uploadReasonTotal,System.currentTimeMillis().toString(),"0")
                //日志
                CallerLogger.i("$M_DEVA$TAG", "BadCase Passive Analytics="+"key="+recordKey+" filename="+recordFileName+
                        " receiveTime="+receiveTime+" stat="+"100"+" plateNumber="+AppConfigInfo.plateNumber+
-                        " totalDuration="+ BadCaseConfig.totalDuration +" carSn="+MoGoAiCloudClientConfig.getInstance().sn+" mapVersion="+BadCaseConfig.dockerVersion+
+                        " totalDuration="+ BadCaseConfig.totalDuration +" carSn="+SharedPrefsMgr.getInstance().sn+" mapVersion="+BadCaseConfig.dockerVersion+
                        " eyeVersion="+AppUtils.getAppVersionName()+" latitude="+ loc.latitude +" longitude="+ loc.longitude+
                        " identity="+BadCaseConfig.identity + " downloadUrl="+downloadUrl +" uploadReason="+uploadReasonTotal+
                        " uploadTime="+System.currentTimeMillis()+" channel="+"0")
--- 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.SuppressLint
 import android.content.Context
 import android.text.TextUtils
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.constants.SharedPrefsConstants
 import com.mogo.eagle.core.data.app.AppConfigInfo.role
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
@@ -19,7 +18,7 @@ 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.Companion.M_DEVA
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import com.mogo.commons.storage.SharedPrefsMgr
 import com.zhjt.mogo_core_function_devatools.trace.TraceManager
 import com.zhjt.mogo_core_function_devatools.upgrade.IPCUpgradeManager.Companion.ipcUpgradeManager
 import com.zhjt.mogo_core_function_devatools.upgrade.ObuUpgradeAppNetWorkManager
@@ -54,8 +53,8 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {

    fun init(context: Context) {
        mContext = context
-        SharedPrefsMgr.getInstance(mContext!!).putLong("typeDriver", 0)
-        SharedPrefsMgr.getInstance(mContext!!).putLong("typePassenger", 0)
+        SharedPrefsMgr.getInstance().putLong("typeDriver", 0)
+        SharedPrefsMgr.getInstance().putLong("typePassenger", 0)
        CallerAutopilotCarConfigListenerManager.addListener(TAG, this)
        CallerCloudListenerManager.addListener(TraceManager.TAG, this)
        ipcUpgradeManager.init(context)
@@ -73,11 +72,11 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {
                "${M_DEVA}${TAG}",
                "onAutopilotCarConfig carConfigResp.macAddress = ${carConfigResp.macAddress} "
            )
-            if (MoGoAiCloudClientConfig.getInstance().sn.isNullOrEmpty()) {
+            if (SharedPrefsMgr.getInstance().sn.isNullOrEmpty()) {
                return
            }
            this.carConfigResp = carConfigResp
-            getBindingCarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn)
+            getBindingCarInfo(carConfigResp.macAddress, SharedPrefsMgr.getInstance().sn)
        }
    }

@@ -115,7 +114,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {
            "${M_DEVA}${TAG}",
            "getBindingcarInfo macAddress = $macAddress--widevineIDWithMd5 = $widevineIDWithMd5 ---screenType = $screenType"
        )
-        SharedPrefsMgr.getInstance(mContext!!).putString(SharedPrefsConstants.APP_MAC, macAddress)
+        SharedPrefsMgr.getInstance().putString(SharedPrefsConstants.APP_MAC, macAddress)
        mWidevineIDWithMd5 = widevineIDWithMd5
        if (screenType == 1) { //司机屏
            driverScreen(macAddress, widevineIDWithMd5)
@@ -158,12 +157,12 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {
    private fun driverScreen(macAddress: String, widevineIDWithMd5: String) {
        val currentHour = System.currentTimeMillis() / (1000 * 60)
        val oldHour = SharedPrefsMgr.getInstance(
-            mContext!!
+            
        ).getLong("typeDriver", 0)
        //如果2分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息
        if (HmiBuildConfig.isShowSnBindingView) {
            if (currentHour - oldHour > 1) {
-                SharedPrefsMgr.getInstance(mContext!!)
+                SharedPrefsMgr.getInstance()
                    .putLong("typeDriver", System.currentTimeMillis() / (1000 * 60))
                BindingCarNetWorkManager.instance
                    .getBindingCarInfo(mContext!!, macAddress, widevineIDWithMd5, screenType)
@@ -173,14 +172,11 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {

    private fun passengerScreen(macAddress: String, widevineIDWithMd5: String) {
        val currentHour = System.currentTimeMillis() / (1000 * 60)
-        val oldHour = SharedPrefsMgr.getInstance(
-            mContext!!
-        ).getLong("typePassenger", 0)
+        val oldHour = SharedPrefsMgr.getInstance().getLong("typePassenger", 0)
        //如果2分钟内频繁调，需要拦截，业务导致的会多次请求工控机信息
        if (HmiBuildConfig.isShowSnBindingView) {
            if (currentHour - oldHour > 1) {
-                SharedPrefsMgr.getInstance(mContext!!)
-                    .putLong("typePassenger", System.currentTimeMillis() / (1000 * 60))
+                SharedPrefsMgr.getInstance().putLong("typePassenger", System.currentTimeMillis() / (1000 * 60))
                BindingCarNetWorkManager.instance
                    .getBindingCarInfo(mContext!!, macAddress, widevineIDWithMd5, screenType)
            }
@@ -212,7 +208,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {
        var macAddress = mAddress
        if (TextUtils.isEmpty(macAddress)) {
            CallerLogger.d(M_DEVA + "UPGRADE", "----  2 ----")
-            macAddress = SharedPrefsMgr.getInstance(mContext!!)
+            macAddress = SharedPrefsMgr.getInstance()
                .getString(SharedPrefsConstants.APP_MAC)
        }
        if (macAddress != null && !TextUtils.isEmpty(macAddress)) {
@@ -241,9 +237,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener {
                "queryObuUpgrade isConnected =  ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress"
            )
            ObuUpgradeAppNetWorkManager.instance?.getObuUpgradeInfo(
-                if (!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(
-                    mContext!!
-                ).getString(SharedPrefsConstants.APP_MAC), obuVersionName
+                if (!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.APP_MAC), obuVersionName
            )
        }
    }
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt
@@ -17,7 +17,7 @@ import com.mogo.eagle.core.network.utils.GsonUtil
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.util.GsonUtils
 import com.zhjt.mogo_core_function_devatools.R
@@ -87,7 +87,7 @@ class BindingCarNetWorkManager private constructor() {
                                "msg" to info
                            )
                        )
-                        SharedPrefsMgr.getInstance(context).putString(
+                        SharedPrefsMgr.getInstance().putString(
                            SharedPrefsConstants.CAR_INFO,
                            GsonUtils.toJson(info.getData())
                        )
@@ -98,7 +98,7 @@ class BindingCarNetWorkManager private constructor() {
                        }
                        updateCarVrIconRes(info.getData().brandId)
                    } else {
-                        SharedPrefsMgr.getInstance(context)
+                        SharedPrefsMgr.getInstance()
                            .putString(SharedPrefsConstants.CAR_INFO, "")
                        e(
                            SceneConstant.M_DEVA + TAG,
@@ -108,7 +108,7 @@ class BindingCarNetWorkManager private constructor() {
                }

                override fun onError(e: Throwable) {
-                    SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "")
+                    SharedPrefsMgr.getInstance().putString(SharedPrefsConstants.CAR_INFO, "")
                    bindLog(mapOf("bindResult" to false, "msg" to e.toString()))
                    e(
                        SceneConstant.M_DEVA + TAG,
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/env/EnvChangeManager.kt
@@ -6,7 +6,7 @@ import com.mogo.commons.constants.SharedPrefsConstants
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.EnvConfig
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.Utils


@@ -15,11 +15,11 @@ object EnvChangeManager {
    private val sp = Utils.getApp().getSharedPreferences("env_change", MODE_PRIVATE)

    private fun updateCityCode(cityCode: String?) {
-        sp.edit().putString("city_code", cityCode).commit()
+        sp.edit().putString("city_code", cityCode).apply()
    }

    private fun updateNetMode(netMode: Int) {
-        sp.edit().putInt("net_mode", netMode).commit()
+        sp.edit().putInt("net_mode", netMode).apply()
    }

    private fun getConfig() : Pair<String, Int>? {
@@ -34,7 +34,7 @@ object EnvChangeManager {
    fun getCityName(): String {
        val cache = getConfig()
        return if (cache == null) {
-            when(CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()?.cityCode ?: SharedPrefsMgr.getInstance(Utils.getApp()).getString(SharedPrefsConstants.LOCATION_CITY_CODE) ?: "010") {
+            when(CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()?.cityCode ?: SharedPrefsMgr.getInstance().getString(SharedPrefsConstants.LOCATION_CITY_CODE) ?: "010") {
                "010" -> "北京"
                "0734" -> "衡阳"
                else -> "未知"
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/network/FuncConfigNetWorkModel.kt
@@ -1,7 +1,7 @@
 package com.zhjt.mogo_core_function_devatools.funcconfig.network

-import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.constants.HostConst
+import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.BaseResponse
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
@@ -10,7 +10,6 @@ import com.mogo.eagle.core.network.request
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.getMisChannelCode
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
-import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigConst
 import com.zhjt.service_biz.FuncConfig

 class FuncConfigNetWorkModel {
@@ -41,7 +40,7 @@ class FuncConfigNetWorkModel {
            }
            loader {
                apiCall {
-                    map["sn"] = MoGoAiCloudClientConfig.getInstance().sn
+                    map["sn"] = SharedPrefsMgr.getInstance().sn
                    map["mac"] = DeviceUtils.getMacAddress()
                    map["channelVersion"] = AppIdentityModeUtils.getMisChannelCode(FunctionBuildConfig.appIdentityMode)
                    getNetWorkApi().funcConfig(map)
--- 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,7 +7,6 @@ import android.os.Message
 import com.mogo.aicloud.services.socket.IMogoOnMessageListener
 import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
 import com.mogo.cloud.passport.MoGoAiCloudClient
-import com.mogo.cloud.passport.MoGoAiCloudClientConfig
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.app.AppConfigInfo
@@ -22,10 +21,9 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 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.logger.scene.SceneConstant.Companion.M_DEVA
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
-import com.mogo.map.MogoData
 import com.zhidao.loglib.bean.RemoteLogPushContent
 import com.zhidao.loglib.call.LogInfoManagerFactory
 import com.zhidao.loglib.core.ILogListener
@@ -66,8 +64,8 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
    }

    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 logger = SharedPrefsMgr.getInstance().getBoolean(MoGoConfig.CATCH_LOG, false)
+        val loggerTime = SharedPrefsMgr.getInstance().getLong(MoGoConfig.CATCH_LOG_TIME, 0)
        val logCatchDuration = (System.currentTimeMillis() - loggerTime) / 1000 / 60
        if (logger && loggerTime > 0) {
            val logTime: Int = if (10 - logCatchDuration < 1) {
@@ -161,7 +159,7 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl

    private fun startCatchLog(content: RemoteLogPushContent, logPrefixName: String? = null) {
        CallerLogger.d("$M_DEVA$TAG", "startCatchLog path : ${content.pkgName + logPrefixName}")
-        if (MoGoAiCloudClientConfig.getInstance().sn == null) {
+        if (SharedPrefsMgr.getInstance().sn == null) {
            ThreadUtils.runOnUiThread {
                TipToast.shortTip("缺少设备唯一ID，请检查网络")
            }
@@ -179,7 +177,7 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
        openLoggerLevel()
        logInfoManager = LogInfoManagerFactory.createPushLogInfoManager(
            mContext,
-            MoGoAiCloudClientConfig.getInstance().sn,
+            SharedPrefsMgr.getInstance().sn,
            AppConfigInfo.toString(),
            logPrefixName?.replace("_", "-"),
            mutableListOf(),
@@ -192,8 +190,8 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
        }
        handler.sendEmptyMessage(MSG_TRY_START_LOG)

-        SharedPrefsMgr.getInstance(mContext!!).putBoolean(MoGoConfig.CATCH_LOG, true)
-        SharedPrefsMgr.getInstance(mContext!!)
+        SharedPrefsMgr.getInstance().putBoolean(MoGoConfig.CATCH_LOG, true)
+        SharedPrefsMgr.getInstance()
            .putLong(MoGoConfig.CATCH_LOG_TIME, System.currentTimeMillis())
    }

@@ -210,8 +208,8 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
        logInfoManager = null
        closeLoggerLevel()

-        SharedPrefsMgr.getInstance(mContext!!).putBoolean(MoGoConfig.CATCH_LOG, false)
-        SharedPrefsMgr.getInstance(mContext!!).putLong(MoGoConfig.CATCH_LOG_TIME, 0)
+        SharedPrefsMgr.getInstance().putBoolean(MoGoConfig.CATCH_LOG, false)
+        SharedPrefsMgr.getInstance().putLong(MoGoConfig.CATCH_LOG_TIME, 0)
    }

    /**
@@ -252,8 +250,8 @@ object MogoLogCatchManager : IMogoOnMessageListener<RemoteLogPushContent>, Handl
        ThreadUtils.runOnUiThread {

            closeLoggerLevel()
-            SharedPrefsMgr.getInstance(mContext!!).putBoolean(MoGoConfig.CATCH_LOG, false)
-            SharedPrefsMgr.getInstance(mContext!!).putLong(MoGoConfig.CATCH_LOG_TIME, 0)
+            SharedPrefsMgr.getInstance().putBoolean(MoGoConfig.CATCH_LOG, false)
+            SharedPrefsMgr.getInstance().putLong(MoGoConfig.CATCH_LOG_TIME, 0)

            CallerDevaToolsListenerManager.invokeDevaToolsLogCatchClose()
        }
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/SyncConfig.kt
@@ -13,6 +13,7 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.getMisChannelCode
 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.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.NetworkUtils
 import com.zhjt.mogo_core_function_devatools.trace.network.StartUpTraceNetWorkModel
 import com.zhjt.service.chain.ChainLog
@@ -24,8 +25,8 @@ object SyncConfig {

    fun update(context: Context) {
        if (MoGoAiCloudClient.getInstance().aiCloudClientConfig != null) {
-            AppConfigInfo.mogoSN = MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn
-            AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
+            AppConfigInfo.mogoSN = SharedPrefsMgr.getInstance().sn
+            AppConfigInfo.mogoToken = SharedPrefsMgr.getInstance().token
        }
        AppConfigInfo.netMode = DebugConfig.getNetMode()
        AppConfigInfo.mapSdkVersion = DebugConfig.getMapVersion()
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt
@@ -13,7 +13,7 @@ import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
 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.mogo.storage.SharedPrefsMgr
+import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.Utils
 import com.zhidao.loglib.call.LogInfoManagerFactory
 import com.zhidao.loglib.fw.FileWriteManager
@@ -39,7 +39,7 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener {

        const val TAG = "TraceManager"
        private const val TRACE_ENABLE = "TRACE_ENABLE"
-        private const val DELAY_UPLOAD = 60 * 60 * 1000L
+        private const val DELAY_UPLOAD = 10 * 60 * 1000L

        val traceManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
            TraceManager()
@@ -109,7 +109,7 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener {
            }
            CallerDevaToolsListenerManager.invokeDevaToolsFwThreadClose()
        }
-        val traceEnable = SharedPrefsMgr.getInstance(context).getBoolean(TRACE_ENABLE,true)
+        val traceEnable = SharedPrefsMgr.getInstance().getBoolean(TRACE_ENABLE,true)
        FileWriteManager.getInstance().setCloseRecord(traceEnable)
        if(traceEnable){
            delayUpload()
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/IPCUpgradeManager.kt
@@ -3,7 +3,7 @@ package com.zhjt.mogo_core_function_devatools.upgrade
 import android.content.Context
 import com.mogo.aicloud.services.socket.IMogoOnMessageListener
 import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
-import com.mogo.cloud.passport.MoGoAiCloudClient
+import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.deva.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
@@ -65,7 +65,7 @@ class IPCUpgradeManager: IMogoOnMessageListener<IPCUpgradeStateInfo> ,
                    //弹窗提示，确认是否进行工控机升级
                    CallerHmiManager.showAdUpgradeDialog(
                        it.images,
-                        MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn,
+                        SharedPrefsMgr.getInstance().sn,
                        releaseId)
                }
            }else{
@@ -89,7 +89,7 @@ class IPCUpgradeManager: IMogoOnMessageListener<IPCUpgradeStateInfo> ,
                }
                CallerHmiManager.showAdUpgradeDialog(
                    it.images,
-                    MoGoAiCloudClient.getInstance().aiCloudClientConfig.sn,
+                    SharedPrefsMgr.getInstance().sn,
                    releaseId)
                //将升级任务置为false
                hasIPCUpgradeTask = false
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.kt
@@ -1,7 +1,7 @@
 package com.zhjt.mogo_core_function_devatools.upgrade

-import com.mogo.cloud.passport.*
 import com.mogo.commons.constants.*
+import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.obu.MogoObuConst.TAG_UPGRADE_OBU
 import com.mogo.eagle.core.function.api.devatools.download.DownloadType.OBU
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager.downLoadPackage
@@ -38,7 +38,7 @@ class ObuUpgradeAppNetWorkManager private constructor() {
        //        String mac1 = "48:b0:2d:4d:33:40";
        scope.launch {
            try {
-                val sn = MoGoAiCloudClientConfig.getInstance().sn
+                val sn = SharedPrefsMgr.getInstance().sn
                d(SceneConstant.M_DEVA + TAG_UPGRADE_OBU, "getObuUpgradeInfo mac = $mac ---sn = $sn ---versionName = $versionName --host = ${HostConst.getHost()}")
                val request = UpgradeAppRequest(sn, mac, "7", null, "0")
                val requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request))
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.kt
@@ -3,7 +3,6 @@ package com.zhjt.mogo_core_function_devatools.upgrade
 import android.content.*
 import android.util.*
 import android.widget.Toast
-import com.mogo.cloud.passport.*
 import com.mogo.commons.constants.*
 import com.mogo.commons.utils.*
 import com.mogo.eagle.core.data.config.*
@@ -22,7 +21,7 @@ import com.mogo.eagle.core.utilcode.kotlin.*
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.getMisChannelCode
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.*
-import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
+import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.eagle.core.utilcode.util.FileUtils
 import kotlinx.coroutines.*
@@ -56,10 +55,10 @@ class UpgradeAppNetWorkManager private constructor() {
    fun getAppUpgradeInfo(context: Context?, mac: String, screenType: String) {
        upgradeJob?.safeCancel()
        scope.launch {
-            val sn = MoGoAiCloudClientConfig.getInstance().sn //null
+            val sn = SharedPrefsMgr.getInstance().sn
            val macAddress = mac //"48:b0:2d:4d:31:7f"
            val type = screenType //"10"
-            SharedPrefsMgr.getInstance(context!!).putString(SharedPrefsConstants.HOST_ADDRESS, HostConst.getHost())
+            SharedPrefsMgr.getInstance().putString(SharedPrefsConstants.HOST_ADDRESS, HostConst.getHost())
            try {
                val records = provider?.getUpgradeRecords()?.also {
                    MogoAnalyticUtils.track("AppUpgradeRecord", TreeMap<String, Any>().also { itx ->
@@ -80,7 +79,7 @@ class UpgradeAppNetWorkManager private constructor() {
                provider?.recordUpgradeRecord(sn ?: "", macAddress, type, FunctionBuildConfig.isSupportPatchUpgrade)
                provider?.recordUpgradeRequestStart()
                val info = mUpgradeApiService.getUpgradeInfo(requestBody)
-                SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.APP_UPGRADE_CONTENT, if (info.result != null) GsonUtils.toJson(info) + "--mac:$macAddress --type:$type --sn:$sn --versionName:$versionName" else "info.result == null  --mac:$macAddress --type:$type --sn:$sn --versionName:$versionName --versionCode:$versionCode")
+                SharedPrefsMgr.getInstance().putString(SharedPrefsConstants.APP_UPGRADE_CONTENT, if (info.result != null) GsonUtils.toJson(info) + "--mac:$macAddress --type:$type --sn:$sn --versionName:$versionName" else "info.result == null  --mac:$macAddress --type:$type --sn:$sn --versionName:$versionName --versionCode:$versionCode")
                if (info.result != null) { 
                    provider?.recordUpgradeRequestSuccess(GsonUtils.toJson(info))
                    doUpgrade(info)
@@ -89,7 +88,7 @@ class UpgradeAppNetWorkManager private constructor() {
                }
            } catch (t: Throwable) {
                t.printStackTrace()
-                SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.APP_UPGRADE_CONTENT,
+                SharedPrefsMgr.getInstance().putString(SharedPrefsConstants.APP_UPGRADE_CONTENT,
                    "$t--mac:$macAddress --type:$type --sn:$sn "
                )
                provider?.recordUpgradeRequestFailed(t.message ?: "更新接口请求失败")