[dev_arch_opt_3.0] 添加obu升级功能

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

@@ -158,6 +158,10 @@ class DevaToolsProvider : IDevaToolsProvider {
         upgradeManager.updateUpgradeProgress(mContext!!)
     }
 
+    override fun updateObuUpgradeStatus() {
+        upgradeManager.updateObuUpgradeStatus(mContext!!)
+    }
+
     override fun showStatusBar(ctx: Context, container: ViewGroup) {
         StatusManager.init(ctx)
         StatusManager.show(container)

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

@@ -57,6 +57,9 @@ 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)
         }
     }
 
@@ -162,11 +165,11 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
     }
 
     /**
-     * 司机屏 处理obu升级即可,乘客屏不需要处理 TODO OBU的角色
+     * 司机屏 处理obu升级即可,乘客屏不需要处理
      *
      */
-    fun queryObuUpgrade() {
-        ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, mAddress, role.toString() + "")
+    private fun queryObuUpgrade(macAddress: String) {
+        ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, macAddress)
     }
 
 }

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

@@ -7,6 +7,7 @@ import android.content.Context;
 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.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;
@@ -48,17 +49,17 @@ public class ObuUpgradeAppNetWorkManager {
     }
 
     /**
-     * 获取obu升级信息
+     * 获取obu升级信息，obu升级服务端使用app升级接口，根据screenType区分类型
      * mac ：工控机mac地址
      * screenType ： 类型
      */
-    public void getObuUpgradeInfo(Context context, String mac, String screenType) {
+    public void getObuUpgradeInfo(Context context, String mac) {
 //        String sn = "X20202203105S688HZ";
 //        String mac = "48:b0:2d:3a:bc:78";
         String sn = MoGoAiCloudClientConfig.getInstance().getSn();
-        int versionCode = AppUtils.getAppVersionCode();
-        CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo mac = " + mac + "---type = " + screenType + "---sn = " + sn + "---versionCode =" + versionCode);
-        UpgradeAppRequest request = new UpgradeAppRequest(sn, mac, screenType);
+        String obuVersionName = String.valueOf(AppUtils.getAppVersionCode()); // TODO 获取obu的版本号, string和int 服务端处理
+        CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo mac = " + mac + "---sn = " + sn + "---obuVersionName =" + obuVersionName);
+        UpgradeAppRequest request = new UpgradeAppRequest(sn, mac, "7");
         RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
         mUpgradeApiService.getUpgradeInfo(requestBody)
                 .subscribeOn(Schedulers.io())
@@ -71,9 +72,10 @@ 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() + "----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());
+                            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());
                             }
                         } else {
                             CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo onNext info == null");

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

@@ -14,6 +14,8 @@ 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.mogo.eagle.core.utilcode.util.ZipUtils
+import java.io.IOException
 
 class UpgradeManager : IDownload {
 
@@ -116,6 +118,9 @@ class UpgradeManager : IDownload {
         }
     }
 
+    /**
+     * 鹰眼app下载监听
+     */
     fun updateUpgradeProgress(context: Context) {
         val builder = NotificationCompat.Builder(context)
         //        builder.setSmallIcon(R.mipmap.icon1001);//todo emArrow 更换图标，去除地图下载图标的依赖关系
@@ -147,4 +152,34 @@ class UpgradeManager : IDownload {
             })
     }
 
+    /**
+     * obu升级包下载监听
+     */
+    fun updateObuUpgradeStatus(context: Context) {
+        CallerDevaToolsUpgradeListenerManager.addListener(
+            TAG,
+            object : IMogoDevaToolsUpgradeListener {
+                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升级
+
+                    } catch (e: IOException) {
+                        //解压失败
+
+                        e.printStackTrace()
+                    }
+                }
+
+                override fun onError(url: String?, errorMsg: String?) {}
+            })
+    }
+
 }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java

@@ -53,6 +53,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
             CallerMsgBoxManager.INSTANCE.queryAllMessages(this);
         }
         CallerDevaToolsManager.INSTANCE.updateUpgradeProgress();
+        CallerDevaToolsManager.INSTANCE.updateObuUpgradeStatus();
     }
 
     @Override