[dev_arch_opt_3.0] 优化升级功能

core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt

@@ -54,7 +54,6 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
 
     private var mObuStatusInfo = CallerObuConnectListenerManager.getObuStatusInfo()
     private var mContext: Context? = null
-    var mVersionName: String? = null
 
     fun connectObu(context: Context, obuIpAddress: String, padIpAddress: String) {
         ObuManager.getInstance().registerObuListener(mogoObuListener)
@@ -110,7 +109,6 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
     override fun onCurrentVersion(version: MogoObuSystemBConfigData) {
         CallerLogger.d("$M_OBU${MogoObuConst.TAG_UPGRADE_OBU}", "onCurrentVersion version = ${version.version}")
         if (!version.version.isNullOrEmpty()) {
-            mVersionName = version.version
             CallerObuInfoListenerManager.invokeObuVersionName(version.version)
             CallerDevaToolsManager.queryObuUpgrade(version.version)
         }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java

@@ -10,6 +10,7 @@ import com.mogo.commons.constants.HostConst;
 import com.mogo.eagle.core.data.bindingcar.UpgradeAppInfo;
 import com.mogo.eagle.core.data.obu.MogoObuConst;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
+import com.mogo.eagle.core.function.call.obu.CallerObuApiManager;
 import com.mogo.eagle.core.network.MoGoRetrofitFactory;
 import com.mogo.eagle.core.network.utils.GsonUtil;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
@@ -78,12 +79,15 @@ public class ObuUpgradeAppNetWorkManager {
                             }
                         } else {
                             CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo onNext info == null");
+                            CallerObuApiManager.INSTANCE.deleteObuFile();
                         }
                     }
 
                     @Override
                     public void onError(Throwable e) {
                         CallerLogger.INSTANCE.e(M_BINDING + TAG, "getObuUpgradeInfo e = " + e);
+                        //请求出错，需要删除相关文件
+                        CallerObuApiManager.INSTANCE.deleteObuFile();
                     }
 
                     @Override

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeAppNetWorkManager.java

@@ -4,14 +4,17 @@ import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BIN
 
 import android.content.Context;
 
+import com.elegant.utils.UiThreadHandler;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.commons.constants.HostConst;
 import com.mogo.eagle.core.data.bindingcar.UpgradeAppInfo;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.network.MoGoRetrofitFactory;
 import com.mogo.eagle.core.network.utils.GsonUtil;
+import com.mogo.eagle.core.utilcode.breakpoint.Config;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.AppUtils;
+import com.mogo.eagle.core.utilcode.util.FileUtils;
 
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -72,15 +75,18 @@ public class UpgradeAppNetWorkManager {
                             CallerLogger.INSTANCE.d(M_BINDING + TAG, "UpgradeAppInfo url = " + info.result.getAppUrl() + "----code = " + info.result.getVersionCode() + "--versionCode =" + versionCode + "--info.result = " + info.result);
                             if (info.result.getVersionCode() > versionCode) {
                                 CallerHmiManager.INSTANCE.showUpgradeDialog(info.result.getAppUrl().substring(info.result.getAppUrl().lastIndexOf("/")+1), info.result.getAppUrl(), info.result.getInstallTitle(), info.result.getInstallContent(), info.result.getInstallType());
+                            } else {
+                                deleteApkFile();
                             }
                         } else {
                             CallerLogger.INSTANCE.d(M_BINDING + TAG, "UpgradeAppInfo onNext info == null");
+                            deleteApkFile();
                         }
                     }
 
                     @Override
                     public void onError(Throwable e) {
-
+                        deleteApkFile();
                     }
 
                     @Override
@@ -90,4 +96,16 @@ public class UpgradeAppNetWorkManager {
 
     }
 
+    /**
+     * 删除APK 相关的文件
+     */
+    private void deleteApkFile(){
+        UiThreadHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                FileUtils.delete(Config.downLoadPath);
+            }
+        });
+    }
+
 }

core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/Config.java

@@ -13,9 +13,15 @@ public class Config {
     public final static String downLoadPath = Environment.getExternalStorageDirectory().getAbsolutePath()
             + "/downloads/";
 
+    /**
+     * OBU下载路径
+     */
     public final static String downLoadObuPath = Environment.getExternalStorageDirectory().getAbsolutePath()
             + "/obu/";
 
+    /**
+     * OBU解压路径
+     */
     public final static String downLoadUnzipObuPath = Environment.getExternalStorageDirectory().getAbsolutePath()
             + "/obuunzip/";