From 56ff2a369ce2fa96af0f1ea8f149850a9c57eddc Mon Sep 17 00:00:00 2001 From: renwj Date: Mon, 21 Oct 2024 19:28:50 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0][=E5=BA=94=E7=94=A8=E5=8D=87=E7=BA=A7]?= =?UTF-8?q?=20=E5=BA=94=E7=94=A8=E5=8D=87=E7=BA=A7=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=B7=BB=E5=8A=A0=E6=8E=A5=E5=8F=A3=E5=9B=9E?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DevaToolsProvider.kt | 6 +++--- .../binding/BindingCarManager.kt | 6 +++--- .../upgrade/UpgradeAppNetWorkManager.kt | 18 +++++++++++++----- .../provider/MoGoUpgradeProviderImpl.kt | 4 ---- .../api/devatools/IDevaToolsProvider.kt | 2 +- .../call/devatools/CallerDevaToolsManager.kt | 4 ++-- 6 files changed, 22 insertions(+), 18 deletions(-) diff --git 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 index b7b6b744f1..ca49ae0e1c 100644 --- 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 @@ -271,7 +271,7 @@ class DevaToolsProvider : IDevaToolsProvider, IAppStateListener { isShowRouteStrategy = !AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) bizConfigCenter.updateChannelRole() //功能开关配置更新 traceManager.syncConfig() //同步信息至ms - BindingCarManager.queryAppUpgrade() //更新App升级信息 + BindingCarManager.queryAppUpgrade(null) //更新App升级信息 } private fun initMatrix() { @@ -603,8 +603,8 @@ class DevaToolsProvider : IDevaToolsProvider, IAppStateListener { WorkOrderManager.workOrderManager.getCategories(tenantId, level, parentId,type, upType) } - override fun queryAppUpgrade() { - BindingCarManager.queryAppUpgrade() + override fun queryAppUpgrade(block: ((Boolean, String?) -> Unit)?) { + BindingCarManager.queryAppUpgrade(block) } // override fun apmEnvProvider(): IApmEnvProvider = apmEnvProvider diff --git 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 index 842744d77a..758e79912e 100644 --- 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 @@ -110,7 +110,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener { mAddress = macAddress } if (flag) { - queryAppUpgrade() + queryAppUpgrade(null) val obuVersion = mObuVersion if (obuVersion != null && !TextUtils.isEmpty(obuVersion)) { queryObuUpgrade(obuVersion) @@ -216,7 +216,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener { /** * 查询app是否需要升级 */ - fun queryAppUpgrade() { + fun queryAppUpgrade(block: ((Boolean, String?) -> Unit)?) { CallerLogger.d(M_DEVA + "UPGRADE", "---- 1 ----") var macAddress = mAddress if (TextUtils.isEmpty(macAddress)) { @@ -230,7 +230,7 @@ object BindingCarManager : IMoGoAutopilotCarConfigListener, IMoGoCloudListener { } CallerLogger.d(M_DEVA + "UPGRADE", "---- 3 ----[mac: $macAddress]") UpgradeAppNetWorkManager.instance - ?.getAppUpgradeInfo(mContext, macAddress, AppIdentityModeUtils.getMisChannelCode(FunctionBuildConfig.appIdentityMode).toString() + "") + ?.getAppUpgradeInfo(mContext, macAddress, AppIdentityModeUtils.getMisChannelCode(FunctionBuildConfig.appIdentityMode).toString() + "", block) } } diff --git 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 index e5b88d305e..5ee1c75e46 100644 --- 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 @@ -55,7 +55,7 @@ class UpgradeAppNetWorkManager private constructor() { /** * 获取app升级信息 */ - fun getAppUpgradeInfo(context: Context?, mac: String, screenType: String) { + fun getAppUpgradeInfo(context: Context?, mac: String, screenType: String, block: ((Boolean, String?) -> Unit)? = null) { upgradeJob?.safeCancel() scope.launch { var sn = SharedPrefsMgr.getInstance().sn @@ -101,12 +101,20 @@ class UpgradeAppNetWorkManager private constructor() { provider?.recordUpgradeRecord(sn ?: "", macAddress, type, FunctionBuildConfig.isSupportPatchUpgrade) provider?.recordUpgradeRequestStart() val info = mUpgradeApiService.getUpgradeInfo(requestBody) - 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)) + val response = GsonUtils.toJson(info) + SharedPrefsMgr.getInstance().putString(SharedPrefsConstants.APP_UPGRADE_CONTENT, if (info.result != null) response + "--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) { + runCatching { + block?.invoke(true, response) + } + provider?.recordUpgradeRequestSuccess(response) doUpgrade(info) } else { - provider?.recordUpgradeRequestFailed(info.msg?:"请检查升级服务日志") + val error = info.msg?:"请检查升级服务日志" + runCatching { + block?.invoke(false, error) + } + provider?.recordUpgradeRequestFailed(error) } } catch (t: Throwable) { t.printStackTrace() diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/MoGoUpgradeProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/MoGoUpgradeProviderImpl.kt index 23a9d8dac7..af3d343a5c 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/MoGoUpgradeProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/MoGoUpgradeProviderImpl.kt @@ -2,7 +2,6 @@ package com.zhjt.mogo_core_function_devatools.upgrade.provider import android.content.* import android.content.pm.PackageInstaller -import android.widget.Toast import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.deva.chain.* @@ -59,9 +58,6 @@ class MoGoUpgradeProviderImpl: IMoGoUpgradeProvider { } override suspend fun recordUpgradeRequestFailed(error: String) { - if(error.isNotEmpty()){ - ToastUtils.showShort(error) - } UpgradeDbHelper.insertCheckRecord(CheckRecord(AppUtils.getAppVersionName(), FAIL, error, time = System.currentTimeMillis())) try { onUpgradeRecordLinkLog(mapOf("upgrade_request_failed" to error)) diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt index 8d1f2c14b0..54574db7db 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt @@ -283,7 +283,7 @@ interface IDevaToolsProvider : IProvider { /** * 查询app是否有更新 */ - fun queryAppUpgrade() + fun queryAppUpgrade(block: ((Boolean, String?) -> Unit)? = null) /** * 查询obu是否有更新 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt index c674221c90..e4a4bb57fc 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt @@ -393,8 +393,8 @@ object CallerDevaToolsManager { devaToolsProviderApi?.dockerVersion(dockerVersion) } - fun queryAppUpgrade(){ - devaToolsProviderApi?.queryAppUpgrade() + fun queryAppUpgrade(block: ((Boolean, String?) -> Unit)? = null){ + devaToolsProviderApi?.queryAppUpgrade(block) } // fun apmEnvProvider(): IApmEnvProvider? = devaToolsProviderApi?.apmEnvProvider()