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 75af486bdf..38ca984932 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 @@ -60,7 +60,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") + 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") if (info.result != null) { provider?.recordUpgradeRequestSuccess(GsonUtils.toJson(info)) doUpgrade(info) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt index a421883ea4..1f7ab7769b 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt @@ -2,6 +2,7 @@ package com.zhjt.mogo_core_function_devatools.upgrade import android.content.Context import android.content.pm.PackageInstaller +import android.util.Log import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.upgrade.IMoGoUpgradeProvider import com.mogo.eagle.core.function.call.base.CallerBase @@ -229,10 +230,17 @@ class UpgradeManager : IDownload { CallerDevaToolsUpgradeListenerManager.addListener( TAG, object : IMogoDevaToolsUpgradeListener { - override fun onStart(url: String?) {} - override fun onPause(url: String?) {} + override fun onStart(url: String?) { + CallerLogger.d("$M_DEVA$TAG", "updateUpgradeProgress onStart ----> ") + } + override fun onPause(url: String?) { + CallerLogger.d("$M_DEVA$TAG", "updateUpgradeProgress onPause ----> ") + } override fun onProgress(url: String?, length: Int) { - updateStatusBarDownloadView(true, "download", length) +// CallerLogger.d("$M_DEVA$TAG", "updateUpgradeProgress onPause ----> length = $length") + if (length in 1..99) { + updateStatusBarDownloadView(true, "download", length) + } } override fun onFinished(url: String?, localPath: String) { @@ -242,6 +250,10 @@ class UpgradeManager : IDownload { } override fun onError(url: String?, errorMsg: String?) { + CallerLogger.d("$M_DEVA$TAG", "updateUpgradeProgress errorMsg = $errorMsg") + Log.e(TAG, "updateUpgradeProgress errorMsg = $errorMsg") + //出错后,去掉下载进度ui,提示检查网络 + updateStatusBarDownloadView(false, "download", 0) } }) } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/callback/DownloadCallBack.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/callback/DownloadCallBack.java index 0bda622268..31ada1d8f5 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/callback/DownloadCallBack.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/callback/DownloadCallBack.java @@ -31,4 +31,10 @@ public interface DownloadCallBack { * @param localPath */ void threadDownLoadFinished(String url, ThreadBean threadBean, String localPath); + + /** + * 下载错误 + * @param msg + */ + void errorCallBack(String url, String msg); } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/services/DownloadService.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/services/DownloadService.java index 9a11b686d8..1f5832abe5 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/services/DownloadService.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/services/DownloadService.java @@ -161,6 +161,14 @@ public class DownloadService implements InitThread.InitCallBack, DownloadCallBac } } + @Override + public void errorCallBack(String url, String msg) { + IDownload iDownload = callBacks.get(url); + if (iDownload != null) { + iDownload.onError(url, msg); + } + } + @Override public void onConnected(NetworkUtils.NetworkType networkType) { //网络连接已连接 diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java index 5e2a0280ba..70a8cc23ed 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java @@ -153,6 +153,11 @@ public class DownloadTask implements DownloadCallBack { } } + @Override + public void errorCallBack(String url, String msg) { + UiThreadHandler.post(() -> downloadCallBack.errorCallBack(url, msg)); + } + public FileBean getFileBean() { return fileBean; } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java index d233fdbc73..fab591c394 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java @@ -82,6 +82,8 @@ public class DownloadThread extends Thread { DownloadData downloadData = new DownloadData(); downloadData.setUrl(fileBean.getUrl()); downloadData.setMsg(e.getMessage()); + UiThreadHandler.post(() -> callback.errorCallBack(this.fileBean.getUrl(), e.getMessage())); + // EventMessage eventMessage = new EventMessage(EventMessage.TYPE_ERROR,downloadData); // EventBus.getDefault().post(eventMessage); } finally {