yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改下载没有回调bug，添加下载完成自动安装

Browse Source
This commit is contained in:
lixiaopeng
2022-06-27 15:18:16 +08:00
committed by liujing
parent 652085e1a9
commit ddc6ff3d18
5 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/appupgrade/network/UpgradeAppNetWorkManager.java
View File

@@ -59,11 +59,11 @@ public class UpgradeAppNetWorkManager {
* 获取app升级信息
*/
public void getAppUpgradeInfo(Context context, String screenType, String carType) {
// String sn = "X20202203105S688HZ";
String sn = "X20202203105S688HZ";
// int versionCode = 2070000;
// String versionName = "2.7.0";
String sn = MoGoAiCloudClientConfig.getInstance().getSn();
// String sn = MoGoAiCloudClientConfig.getInstance().getSn();
int versionCode = AppUtils.getAppVersionCode();
String versionName = AppUtils.getAppVersionName();
@@ -82,7 +82,7 @@ public class UpgradeAppNetWorkManager {
if (info != null && info.getData() != null && info.getData().size() > 0) {
CallerLogger.INSTANCE.e(TAG, "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "---info.getData().get(0).getVersion_code() = " + info.getData().get(0).getVersion_code());
Log.d("liyz", "UpgradeAppInfo url = " + info.getData().get(0).getApp_url() + "----code = " + info.getData().get(0).getVersion_code());
if (info.getData().get(0).getVersion_code() > versionCode) {
if (info.getData().get(0).getVersion_code() >= versionCode) {
CallerHmiManager.INSTANCE.showUpgradeDialog(info.getData().get(0).getApp_url().substring(info.getData().get(0).getApp_url().lastIndexOf("/")+1), info.getData().get(0).getApp_url());
}
}

6
core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt
View File

@@ -1,6 +1,7 @@
package com.zhjt.mogo_core_function_devatools.upgrade
import android.content.Context
import android.util.Log
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager
import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsUpgradeListenerManager
import com.mogo.eagle.core.utilcode.breakpoint.Config
@@ -9,6 +10,7 @@ import com.mogo.eagle.core.utilcode.breakpoint.callback.IDownload
import com.mogo.eagle.core.utilcode.breakpoint.utils.DownloadUtils
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.AppUtils
import com.zhjt.mogo_core_function_devatools.upgrade.network.UpgradeVersionNetWorkModel
class UpgradeManager : IDownload {
@@ -72,6 +74,10 @@ class UpgradeManager : IDownload {
}
override fun onFinished(downloadUrl: String?, threadBean: ThreadBean?) {
if (downloadUrl != null) {
AppUtils.installApp(Config.downLoadPath + downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1))
}
findKey(downloadUrl) {
CallerDevaToolsUpgradeListenerManager.invokeUpgradeFinish(it)
}

9
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/services/DownloadService.java
View File

@@ -39,6 +39,8 @@ public class DownloadService implements InitThread.InitCallBack, DownloadCallBac
private final Map<String, IDownload> callBacks = new ConcurrentHashMap<>();
public static ExecutorService executorService = Executors.newCachedThreadPool();
private IDownload mIDownload = null;
private DownloadService(Context context) {
mContext = context;
NetworkUtils.registerNetworkStatusChangedListener(this);
@@ -56,6 +58,8 @@ public class DownloadService implements InitThread.InitCallBack, DownloadCallBac
}
public synchronized void onStartCommand(Intent intent, IDownload iDownload) {
mIDownload = iDownload;
if (intent == null) {
Log.e(DOWN_LOAD_TAG, "onStartCommand intent is null");
return;
@@ -124,6 +128,8 @@ public class DownloadService implements InitThread.InitCallBack, DownloadCallBac
@Override
public void startDownload(String url) {
callBacks.put(url, mIDownload);
IDownload iDownload = callBacks.get(url);
if (iDownload != null) {
iDownload.onStart(url);
@@ -148,8 +154,11 @@ public class DownloadService implements InitThread.InitCallBack, DownloadCallBac
@Override
public void threadDownLoadFinished(String url, ThreadBean threadBean) {
Log.e(DOWN_LOAD_TAG, "threadDownLoadFinished 1 : " + url);
IDownload iDownload = callBacks.get(url);
Log.d(DOWN_LOAD_TAG, "iDownload = " + iDownload);
if (iDownload != null) {
Log.e(DOWN_LOAD_TAG, "threadDownLoadFinished 2 : " + url);
iDownload.onFinished(url, threadBean);
}
}

1
core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java
View File

@@ -142,6 +142,7 @@ public class DownloadTask implements DownloadCallBack {
}
}
if (threads.size() == 0) {//如果列表size为0 则所有线程已下载完成
Log.d(DOWN_LOAD_TAG, "下载完成----->");
//删除数据库中的信息
dao.deleteThread(fileBean.getUrl());
//发送下载完成事件

1
gradle.properties
View File

@@ -93,7 +93,6 @@ applicationName=IntelligentPilot
versionCode=2080000
versionName=2.8.0
################# 新架构模块Maven版本管理 #################
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.58.10
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.58.10