[dev_arch_opt_3.0] 联调完成obu升级功能

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt

@@ -239,4 +239,8 @@ class DevaToolsProvider : IDevaToolsProvider {
     }
 
     override fun apmEnvProvider(): IApmEnvProvider = apmEnvProvider
+
+    override fun queryObuUpgrade(obuVersionName: String) {
+        bindingCarManager.queryObuUpgrade(obuVersionName)
+    }
 }

core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt

@@ -9,11 +9,14 @@ import com.mogo.eagle.core.data.app.AppConfigInfo.role
 import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HmiBuildConfig
+import com.mogo.eagle.core.data.obu.MogoObuConst
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager
+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.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.zhjt.mogo_core_function_devatools.upgrade.IPCUpgradeManager.Companion.ipcUpgradeManager
@@ -59,9 +62,6 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
         if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.macAddress)) {
             Log.d("Upgrade", "MoGoHandAdasMsgManager address = " + carConfigResp.macAddress)
             getBindingCarInfo(carConfigResp.macAddress, MoGoAiCloudClientConfig.getInstance().sn)
-
-            //obu的升级,只需要司机屏连接
-            queryObuUpgrade(carConfigResp.macAddress)
         }
     }
 
@@ -164,14 +164,16 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
     fun queryAppUpgrade() {
         UpgradeAppNetWorkManager.getInstance()
             .getAppUpgradeInfo(mContext, mAddress, role.toString() + "")
+
     }
 
     /**
      * 司机屏 处理obu升级即可,乘客屏不需要处理
-     *
+     * obu的升级,只需要司机屏连接
      */
-    private fun queryObuUpgrade(macAddress: String) {
-        ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, macAddress)
+    fun queryObuUpgrade(obuVersionName: String) {
+        CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}","queryObuUpgrade isConnected =  ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress")
+        ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, mAddress, obuVersionName)
     }
 
 }

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

@@ -3,17 +3,17 @@ package com.zhjt.mogo_core_function_devatools.upgrade;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BINDING;
 
 import android.content.Context;
+import android.util.Log;
 
 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.data.obu.MogoObuConst;
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
-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.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.AppUtils;
-
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.annotations.NonNull;
@@ -50,15 +50,15 @@ public class ObuUpgradeAppNetWorkManager {
 
     /**
      * 获取obu升级信息，obu升级服务端使用app升级接口，根据screenType区分类型
-     * mac ：工控机mac地址
+     * mac ：工控机mac地址，
      * screenType ： 类型
      */
-    public void getObuUpgradeInfo(Context context, String mac) {
+    public void getObuUpgradeInfo(Context context, String mac, String versionName) {
 //        String sn = "X20202203105S688HZ";
-//        String mac = "48:b0:2d:3a:bc:78";
+//        String mac1 = "48:b0:2d:4d:33:40";
+
         String sn = MoGoAiCloudClientConfig.getInstance().getSn();
-        String obuVersionName = String.valueOf(AppUtils.getAppVersionCode()); // TODO 获取obu的版本号, string和int 服务端处理
-        CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo mac = " + mac + "---sn = " + sn + "---obuVersionName =" + obuVersionName);
+        CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo mac = " + mac + " ---sn = " + sn + " ---versionName = " + versionName);
         UpgradeAppRequest request = new UpgradeAppRequest(sn, mac, "7");
         RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
         mUpgradeApiService.getUpgradeInfo(requestBody)
@@ -72,10 +72,9 @@ public class ObuUpgradeAppNetWorkManager {
                     @Override
                     public void onNext(@NonNull UpgradeAppInfo info) {
                         if (info != null && info.result != null) {
-                            CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo url = " + info.result.getAppUrl() + "----name = " + info.result.getVersionName() + "--obuVersionName =" + obuVersionName + "--info.result = " + info.result);
-                            if (!String.valueOf(info.result.getVersionName()).equals(obuVersionName)) {
-                                //下载 TAG和文件名 TODO
-                                CallerDevaToolsManager.INSTANCE.downLoadPackage("OBU", info.result.getAppUrl());
+                            CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo appFileName = " + info.result.getAppFileName() + " ----url = " + info.result.getAppUrl() + " ----name = " + info.result.getVersionName() + " --obuVersionName =" + versionName + " ---info.result = " + info.result);
+                            if (!String.valueOf(info.result.getVersionName()).equals(versionName)) { //判断是否下载,当文件名称不一致的时候，就下载
+                                CallerDevaToolsManager.INSTANCE.downLoadPackage(info.result.getAppFileName(), info.result.getAppUrl());
                             }
                         } else {
                             CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo onNext info == null");
@@ -84,7 +83,7 @@ public class ObuUpgradeAppNetWorkManager {
 
                     @Override
                     public void onError(Throwable e) {
-
+                        CallerLogger.INSTANCE.e(M_BINDING + TAG, "getObuUpgradeInfo e = " + e);
                     }
 
                     @Override

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

@@ -2,18 +2,23 @@ package com.zhjt.mogo_core_function_devatools.upgrade
 
 import android.app.NotificationManager
 import android.content.Context
+import android.util.Log
 import androidx.core.app.NotificationCompat
 import com.elegant.utils.UiThreadHandler
+import com.mogo.eagle.core.data.obu.MogoObuConst
 import com.mogo.eagle.core.function.api.devatools.IMogoDevaToolsUpgradeListener
 import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsUpgradeListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.updateStatusBarDownloadView
+import com.mogo.eagle.core.function.call.obu.CallerObuApiManager
 import com.mogo.eagle.core.utilcode.breakpoint.Config
 import com.mogo.eagle.core.utilcode.breakpoint.bean.ThreadBean
 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
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA
 import com.mogo.eagle.core.utilcode.util.AppUtils
+import com.mogo.eagle.core.utilcode.util.FileUtils
 import com.mogo.eagle.core.utilcode.util.ZipUtils
 import java.io.IOException
 
@@ -29,12 +34,18 @@ class UpgradeManager : IDownload {
     }
 
     private var map: Map<String, String>? = null
+    private var mDownloadFileName: String? = null
 
     fun downLoadPackage(context: Context, downloadKey: String,downloadUrl: String) {
+        CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "UpgradeManager downLoadPackage = " + downloadUrl?.contains(".zip") + "----downloadKey = $downloadKey  ---downloadUrl = $downloadUrl")
+        if (downloadUrl?.contains(".zip")) {
+            mDownloadFileName = downloadKey
+        }
+
         DownloadUtils.downLoad(
             context,
             downloadUrl,
-            Config.downLoadPath,
+            if (downloadUrl?.contains(".zip"))  Config.downLoadObuPath else Config.downLoadPath,
             downloadKey,
             5,
             this
@@ -81,7 +92,7 @@ class UpgradeManager : IDownload {
     }
 
     override fun onFinished(downloadUrl: String?, threadBean: ThreadBean?) {
-        if (downloadUrl != null) {
+        if (downloadUrl != null) { //TODO 需要判断是否是apk文件
             AppUtils.installApp(Config.downLoadPath + downloadUrl.substring(downloadUrl.lastIndexOf("/") + 1))
         }
         if (downloadUrl != null) {
@@ -119,7 +130,7 @@ class UpgradeManager : IDownload {
     }
 
     /**
-     * 鹰眼app下载监听
+     * 鹰眼app下载监听 liyz
      */
     fun updateUpgradeProgress(context: Context) {
         val builder = NotificationCompat.Builder(context)
@@ -162,23 +173,38 @@ class UpgradeManager : IDownload {
                 override fun onStart(url: String?) {}
                 override fun onPause(url: String?) {}
                 override fun onProgress(url: String?, length: Int) {
-
                 }
 
                 override fun onFinished(url: String?) {
-                    //下载完成，解压文件 TODO
+                    //下载完成，解压文件
                     try {
-                        val files = ZipUtils.unzipFile("", "")
-                        //传给obu升级
-
+                        val files = ZipUtils.unzipFile(Config.downLoadObuPath + mDownloadFileName, Config.downLoadUnzipObuPath)
+                        CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", " onFinished file = ${Config.downLoadObuPath + mDownloadFileName} -----files = $files ")
+                        //1传给obu升级,升级成功，2需要删除相应文件夹
+                        var md5Path = ""
+                        var tarPath = ""
+                        for (f in files) {
+                            if (f.path.contains(".md5")) {
+                                md5Path = f.path
+                            }
+                            if (f.path.contains(".gz")) {
+                                tarPath = f.path
+                            }
+                        }
+                        CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "updateObuUpgradeStatus ---md5Path = $md5Path -----tarPath = $tarPath ")
+                        CallerObuApiManager.uploadObuPack(arrayOf(md5Path, tarPath))
                     } catch (e: IOException) {
                         //解压失败
-
+                        com.mogo.eagle.core.utilcode.util.UiThreadHandler.post {
+                            var isDeleteSuccess = FileUtils.delete(Config.downLoadObuPath)
+                            var isDeleteUnzipSuccess = FileUtils.delete(Config.downLoadUnzipObuPath)
+                        }
                         e.printStackTrace()
                     }
                 }
 
-                override fun onError(url: String?, errorMsg: String?) {}
+                override fun onError(url: String?, errorMsg: String?) {
+                }
             })
     }