[code_opt_3.3.0]merge 3.2.0

2023-05-30 16:57:31 +08:00
parent 63f66b982f 8f4c7977ec
commit 815bf5f170
112 changed files with 1862 additions and 570 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
@@ -34,7 +34,7 @@ import com.zhjt.mogo_core_function_devatools.apm.*
 import com.mogo.eagle.core.function.api.upgrade.*
 import com.zhjt.mogo_core_function_devatools.badcase.BadCaseManager
 import com.zhjt.mogo_core_function_devatools.badcase.consts.BadCaseConfig
-import com.zhjt.mogo_core_function_devatools.binding.BindingCarManager.Companion.bindingCarManager
+import com.zhjt.mogo_core_function_devatools.binding.*
 import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager
 import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigCenter.Companion.bizConfigCenter
 import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigImpl
@@ -90,7 +90,7 @@ class DevaToolsProvider : IDevaToolsProvider {
        //升级(鹰眼/工控)与监控服务
        iPCReportManager.initServer()
        moFangManager.init(mContext!!)
-        bindingCarManager.init(mContext!!)
+        BindingCarManager.init(mContext!!)
        apmEnvProvider.init(if(DebugConfig.isDebug()) "0" else "1", "${ DebugConfig.getNetMode() }", mDockerVersion ?: "")
        BadCaseManager.init()
    }
@@ -313,29 +313,29 @@ class DevaToolsProvider : IDevaToolsProvider {
    }

    override fun modifyCarInfo(callBack: (ModifyBindingcarInfo) -> Unit) {
-        bindingCarManager.modifyCarInfo(callBack)
+        BindingCarManager.modifyCarInfo(callBack)
    }

    override fun getBindingCarInfo(macAddress: String, widevineIDWithMd5: String) {
-        bindingCarManager.getBindingCarInfo(macAddress, widevineIDWithMd5)
+        BindingCarManager.getBindingCarInfo(macAddress, widevineIDWithMd5)
    }

    override fun upgradeConfirm(images: List<String>, padSn: String, releaseId: String) {
-        bindingCarManager.upgradeConfirm(images, padSn, releaseId)
+        BindingCarManager.upgradeConfirm(images, padSn, releaseId)
    }

    override fun queryContainers(padSn: String, dockerVersion: String) {
-        bindingCarManager.queryContainers(padSn, dockerVersion)
+        BindingCarManager.queryContainers(padSn, dockerVersion)
    }

    override fun queryAppUpgrade() {
-        bindingCarManager.queryAppUpgrade()
+        BindingCarManager.queryAppUpgrade()
    }

    override fun apmEnvProvider(): IApmEnvProvider = apmEnvProvider

    override fun queryObuUpgrade(obuVersionName: String) {
-        bindingCarManager.queryObuUpgrade(obuVersionName)
+        BindingCarManager.queryObuUpgrade(obuVersionName)
    }

    override fun upgradeProvider(): IMoGoUpgradeProvider? {
--- 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
@@ -1,7 +1,9 @@
 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
@@ -16,6 +18,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.Logger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.zhjt.mogo_core_function_devatools.upgrade.IPCUpgradeManager.Companion.ipcUpgradeManager
@@ -26,21 +29,19 @@ import mogo.telematics.pad.MessagePad
 /**
 * 车辆绑定
 */
-class BindingCarManager : IMoGoAutopilotCarConfigListener {
+@SuppressLint("StaticFieldLeak")
+object BindingCarManager : IMoGoAutopilotCarConfigListener {

-    companion object {
-        private const val TAG = "BindingCarManager"
-
-        val bindingCarManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
-            BindingCarManager()
-        }
-    }
+    private const val TAG = "BindingCarManager"

    private var mContext: Context? = null

    @Volatile
    private var mAddress: String? = null

+    @Volatile
+    private var mObuVersion: String? = null
+
    @Volatile
    private var mWidevineIDWithMd5 //google 数字版权
            : String? = null
@@ -60,11 +61,10 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
    }

    override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) {
-        CallerLogger.d("${SceneConstant.M_BINDING}${TAG}", "onAutopilotCarConfig ----------> ")
-        if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.macAddress)) {
-            CallerLogger.d("${SceneConstant.M_BINDING}${TAG}",
-                "onAutopilotCarConfig carConfigResp.macAddress = ${carConfigResp.macAddress} "
-            )
+        Logger.d("${SceneConstant.M_BINDING}${TAG}", "onAutopilotCarConfig ----------> ")
+        if (!TextUtils.isEmpty(carConfigResp.macAddress)) {
+            Logger.d("${SceneConstant.M_BINDING}${TAG}",
+                "onAutopilotCarConfig carConfigResp.macAddress = ${carConfigResp.macAddress} ")
            getBindingCarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn)
        }
    }
@@ -75,12 +75,27 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
     * @param macAddress
     */
    fun getBindingCarInfo(macAddress: String, widevineIDWithMd5: String) {
+        Log.d("UPGRADE", "-- getBindingCarInfo -- 1 -- : [mac: $macAddress, md5: $widevineIDWithMd5]")
+        var flag = false
+        if (!TextUtils.isEmpty(macAddress) && TextUtils.isEmpty(mAddress)) {
+            Log.d("UPGRADE", "-- getBindingCarInfo -- 2 -- : [mac: $macAddress, md5: $widevineIDWithMd5]")
+            flag = true
+        }
+        if (!TextUtils.isEmpty(macAddress) && !TextUtils.equals(macAddress, mAddress)) {
+            mAddress = macAddress
+        }
+        if (flag) {
+            Log.d("UPGRADE", "-- getBindingCarInfo -- 3 -- : [mac: $macAddress, md5: $widevineIDWithMd5]")
+            queryAppUpgrade()
+            val obuVersion = mObuVersion
+            if (obuVersion != null && !TextUtils.isEmpty(obuVersion)) {
+                queryObuUpgrade(obuVersion)
+            }
+        }
        CallerLogger.d("${SceneConstant.M_BINDING}${TAG}",
            "getBindingcarInfo macAddress = $macAddress--widevineIDWithMd5 = $widevineIDWithMd5 ---screenType = $screenType"
        )
        SharedPrefsMgr.getInstance(mContext!!).putString(SharedPrefsConstants.APP_MAC, macAddress)
-
-        mAddress = macAddress
        mWidevineIDWithMd5 = widevineIDWithMd5
        if (screenType == 1) { //司机屏
            driverScreen(macAddress, widevineIDWithMd5)
@@ -167,13 +182,20 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
     * 查询app是否需要升级
     */
    fun queryAppUpgrade() {
-        CallerLogger.d("${SceneConstant.M_BINDING}${TAG}" + "queryAppUpgrade---role.toString() = ${role.toString()} ---mAddress = $mAddress ---spMac = ${SharedPrefsMgr.getInstance(mContext!!)
-            .getString(SharedPrefsConstants.APP_MAC)}")
-        (if (!mAddress.isNullOrEmpty()) mAddress else SharedPrefsMgr.getInstance(mContext!!)
-            .getString(SharedPrefsConstants.APP_MAC))?.let {
-            CallerLogger.d("${SceneConstant.M_BINDING}${TAG}", "queryAppUpgrade---mAddress = $mAddress")
+        Log.d("UPGRADE", "----  1 ----")
+        var macAddress = mAddress
+        if (TextUtils.isEmpty(macAddress)) {
+            Log.d("UPGRADE", "----  2 ----")
+            macAddress = SharedPrefsMgr.getInstance(mContext!!)
+                .getString(SharedPrefsConstants.APP_MAC)
+        }
+        if (macAddress != null && !TextUtils.isEmpty(macAddress)) {
+            if (!TextUtils.equals(macAddress, mAddress)) {
+                mAddress = macAddress
+            }
+            Log.d("UPGRADE", "----  3 ----[mac: $macAddress]")
            UpgradeAppNetWorkManager.instance
-                ?.getAppUpgradeInfo(mContext, it, role.toString() + "")
+                ?.getAppUpgradeInfo(mContext, macAddress, role.toString() + "")
        }
    }

@@ -182,12 +204,12 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
     * obu的升级,只需要司机屏连接
     */
    fun queryObuUpgrade(obuVersionName: String) {
+        mObuVersion = obuVersionName
        CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "screenType = $screenType ----role = $role")
        if (screenType == 1) {
            CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}","queryObuUpgrade isConnected =  ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress")
            ObuUpgradeAppNetWorkManager.instance?.getObuUpgradeInfo(mContext, 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/tts/TtsManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/tts/TtsManager.kt
@@ -1,13 +1,12 @@
 package com.zhjt.mogo_core_function_devatools.tts

 import android.content.Context
-import com.elegant.utils.storage.SharedPrefsMgr
+import android.util.Log
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.voice.AIAssist
 import com.mogo.eagle.core.function.api.cloud.IMoGoCloudListener
 import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
-import com.zhjt.mogo_core_function_devatools.trace.TraceManager

 class TtsManager : IMoGoCloudListener {

@@ -21,16 +20,14 @@ class TtsManager : IMoGoCloudListener {
    }

    fun initTts(context: Context) {
-        val sn = SharedPrefsMgr.getInstance(context).getString("sn")
-        if (sn.isNullOrEmpty()) {
-            CallerCloudListenerManager.addListener(TraceManager.TAG, this)
-        }
+        CallerCloudListenerManager.addListener(TAG, this)
        AIAssist.getInstance(context)
    }

    override fun tokenGot(token: String, sn: String) {
-        ThreadUtils.runOnUiThread {
+        Log.d(TAG, "网络获取到sn为:${sn}，准备重新初始化Tts")
+        ThreadUtils.runOnUiThread({
            AIAssist.getInstance(AbsMogoApplication.getApp()).initTtsAgain(sn)
-        }
+        }, ThreadUtils.MODE.QUEUE)
    }
 }
--- 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
@@ -2,11 +2,15 @@ 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.*
 import com.mogo.eagle.core.data.deva.bindingcar.*
+import com.mogo.eagle.core.function.api.devatools.download.DownloadType.APK
+import com.mogo.eagle.core.function.api.devatools.download.DownloadType.PATCH
+import com.mogo.eagle.core.function.call.devatools.*
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager.upgradeProvider
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showUpgradeDialog
 import com.mogo.eagle.core.function.call.patch.CallerPatchManager.addPatchInfo
@@ -14,7 +18,7 @@ import com.mogo.eagle.core.function.call.patch.CallerPatchManager.isPatchAccept
 import com.mogo.eagle.core.network.*
 import com.mogo.eagle.core.network.utils.*
 import com.mogo.eagle.core.utilcode.download.Config
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
+import com.mogo.eagle.core.utilcode.kotlin.*
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.*
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.*
@@ -22,6 +26,7 @@ import com.mogo.eagle.core.utilcode.util.FileUtils
 import kotlinx.coroutines.*
 import okhttp3.*
 import java.util.TreeMap
+import java.util.concurrent.TimeUnit

 /**
 * @author lixiaopeng
@@ -36,16 +41,23 @@ class UpgradeAppNetWorkManager private constructor() {

    private val provider by lazy { upgradeProvider() }

+    @Volatile
+    private var upgradeJob: Job? = null
+
+    // 标识静默升级是否已触发下载，如果为true, 直接返回，防止重复下载
+    @Volatile
+    private var mDownloadRequested = false
+
    /**
     * 获取app升级信息
     */
-    fun getAppUpgradeInfo(context: Context?, mac: String, screenType: String) { //        String sn = "X20202203105S688HZ";
+    fun getAppUpgradeInfo(context: Context?, mac: String, screenType: String) {
+        upgradeJob?.safeCancel()
        scope.launch {
            val sn = MoGoAiCloudClientConfig.getInstance().sn //null
            val macAddress = mac //"48:b0:2d:4d:31:7f"
            val type = screenType //"10"
            SharedPrefsMgr.getInstance(context!!).putString(SharedPrefsConstants.HOST_ADDRESS, HostConst.getHost())
-
            try {
                val records = provider?.getUpgradeRecords()?.also {
                    MogoAnalyticUtils.track("AppUpgradeRecord", TreeMap<String, Any>().also { itx ->
@@ -59,7 +71,7 @@ class UpgradeAppNetWorkManager private constructor() {
                Log.d(TAG, "getAppUpgradeInfo: -> records:" + records?.entries?.joinToString(",") { itx -> "key:${itx.key} -> value:[${itx.value.joinToString(",") { "${it.first},${it.second}" } }]"})
                val versionCode = AppUtils.getAppVersionCode()
                val versionName = AppUtils.getAppVersionName()
-                d(SceneConstant.M_BINDING + TAG, "getAppUpgradeInfo mac = $macAddress---type = $type---sn = $sn---versionCode =$versionCode---versionName =$versionName")
+                Log.d(SceneConstant.M_BINDING + TAG, "getAppUpgradeInfo mac = $macAddress---type = $type---sn = $sn---versionCode =$versionCode---versionName =$versionName")
                val request = UpgradeAppRequest(sn, macAddress, type, versionName, "1")
                val requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request))
                provider?.recordUpgradeRecord(sn ?: "", macAddress, type, FunctionBuildConfig.isSupportPatchUpgrade)
@@ -80,13 +92,20 @@ class UpgradeAppNetWorkManager private constructor() {
                provider?.recordUpgradeRequestFailed(t.message ?: "更新接口请求失败")
                deleteApkFile()
            }
+            delay(TimeUnit.HOURS.toMillis(1))
+            if (mDownloadRequested) {
+                mDownloadRequested = false
+            }
+            getAppUpgradeInfo(context, mac, screenType)
+        }.also {
+            upgradeJob = it
        }
    }

    private suspend fun doUpgrade(info: UpgradeAppInfo) {
        if (info.result != null) {
            val versionCode = AppUtils.getAppVersionCode()
-            d(SceneConstant.M_BINDING + TAG, "UpgradeAppInfo url = " + info.result.appUrl + "----code = " + info.result.versionCode + "--versionCode =" + versionCode + "--info.result = " + info.result)
+            Log.d(SceneConstant.M_BINDING + TAG, "UpgradeAppInfo url = " + info.result.appUrl + "----code = " + info.result.versionCode + "--versionCode =" + versionCode + "--info.result = " + info.result)
            if (info.result.versionCode > versionCode) {
                val patchInfo = info.result.patchInfo
                var downloadUrl: String = info.result.appUrl
@@ -122,14 +141,38 @@ class UpgradeAppNetWorkManager private constructor() {
                    Log.d("ApkInstaller", "走全量升级 --- 1 ----")
                    provider?.recordUpgradeRecord(info.result.versionName, null, 0)
                }
-                withContext(Dispatchers.Main) {
-                    showUpgradeDialog(downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1), downloadUrl, info.result.installTitle, info.result.installContent, info.result.installType)
+                if (ApkInstaller.isInstallAppStore(Utils.getApp())) {
+                    if (mDownloadRequested) {
+                        return
+                    }
+                    mDownloadRequested = true
+                    try {
+                        withContext(Dispatchers.Main) {
+                            Toast.makeText(Utils.getApp(), "检测到新版本[${info.result.versionName}]并且当前设备支持静默升级，开始下载新版本...", Toast.LENGTH_SHORT).show()
+                        }
+                    } catch (t: Throwable) {
+                        t.printStackTrace()
+                    }
+                    Log.d("ApkInstaller", "EB5设备，直接走静默，不弹窗...")
+                    CallerDevaToolsManager.downLoadPackage(if (isGoFullUpgrade) APK else PATCH, downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1), downloadUrl)
+                } else {
+                    var activity = AppStateManager.currentActivity()
+                    while (activity == null) {
+                       delay(2000)
+                       activity = AppStateManager.currentActivity()
+                       if (activity != null) {
+                           break
+                       }
+                    }
+                    activity?.lifeCycleScope?.launchWhenResumed {
+                        showUpgradeDialog(downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1), downloadUrl, info.result.installTitle, info.result.installContent, info.result.installType)
+                    }
                }
            } else {
                deleteApkFile()
            }
        } else {
-            d(SceneConstant.M_BINDING + TAG, "UpgradeAppInfo onNext info == null")
+            Log.d(SceneConstant.M_BINDING + TAG, "UpgradeAppInfo onNext info == null")
            deleteApkFile()
        }
    }