和obu联调升级功能完成

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

@@ -44,6 +44,9 @@ class MoGoObuProvider : IMoGoObuProvider {
                 CommonUtils.getIpAddressString()
             )
         }
+
+        //监听obu版本数据
+        MogoPrivateObuNewManager.INSTANCE.readSystemConfig()
     }
 
     /**
@@ -74,4 +77,8 @@ class MoGoObuProvider : IMoGoObuProvider {
     override fun setObuLog(isChecked: Boolean) {
         MogoPrivateObuNewManager.INSTANCE.setObuLog(isChecked)
     }
+
+    override fun uploadObuPack(filePathArray: Array<String>) {
+        MogoPrivateObuNewManager.INSTANCE.uploadObuPack(filePathArray)
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.datacenter.obu
 
 import android.content.Context
+import android.util.Log
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HmiBuildConfig
 import com.mogo.eagle.core.data.enums.*
@@ -9,6 +10,7 @@ import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.api.map.angle.Default
 import com.mogo.eagle.core.function.api.map.angle.TooClose
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
+import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager
@@ -19,8 +21,10 @@ import com.mogo.eagle.core.function.call.obu.CallerObuWarningListenerManager
 import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
 import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.datacenter.obu.utils.TrafficDataConvertUtilsNew
+import com.mogo.eagle.core.utilcode.breakpoint.Config
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
+import com.mogo.eagle.core.utilcode.util.FileUtils
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.support.obu.ObuBase
 import com.mogo.support.obu.ObuScene
@@ -32,6 +36,8 @@ import com.mogo.support.obu.model.*
 import com.mogo.support.obu.option.MogoObuCom
 import com.mogo.support.obu.option.MogoObuLog
 import com.mogo.support.obu.option.MogoObuOptions
+import com.mogo.support.obu.upgrade.ObuSoftwareUpgradeStatus
+import com.mogo.support.obu.upgrade.OnUpgradeListener
 import com.zhidao.support.obu.ObuManager
 import com.zhidao.support.obu.OnObuListener
 import mogo.telematics.pad.MessagePad
@@ -43,7 +49,7 @@ import kotlin.math.roundToInt
  * @since  2021/8/23
  * @description 自研OBU 管理
  */
-class MogoPrivateObuNewManager private constructor() {
+class MogoPrivateObuNewManager private constructor() : OnUpgradeListener {
     companion object {
         val INSTANCE: MogoPrivateObuNewManager by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
             MogoPrivateObuNewManager()
@@ -51,9 +57,12 @@ class MogoPrivateObuNewManager private constructor() {
     }
 
     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)
+        mContext = context
         val com = MogoObuCom.newBuilder()
             .setLocalIp(padIpAddress)
             .setComType(MogoObuComType.UDP)
@@ -83,6 +92,59 @@ class MogoPrivateObuNewManager private constructor() {
         ObuManager.getInstance().connect(options)
     }
 
+    /**
+     * 上传obu文件的状态, 升级成功，需要删除obu的文件和解压文件夹
+     */
+    override fun onUpgradeStatus(status: ObuSoftwareUpgradeStatus?, t: Throwable?) {
+        Log.d("liyz", "onUpgradeStatus status = $status ")
+        //上传完成就相当于成功了，立即升级，比上电升级，只是多了一个重启
+        if (status == ObuSoftwareUpgradeStatus.UPLOAD_FINISH|| status == ObuSoftwareUpgradeStatus.EXEC_UPGRADE_PROGRAM_FINISH
+            || status == ObuSoftwareUpgradeStatus.CONNECTION_FAILED|| status == ObuSoftwareUpgradeStatus.AUTHENTICATION_FAILED
+            || status == ObuSoftwareUpgradeStatus.CHANNEL_ABNORMITY|| status == ObuSoftwareUpgradeStatus.UPGRADE_PACKAGE_ERROR
+            || status == ObuSoftwareUpgradeStatus.UPGRADE_PACKAGE_CHECK_FAILED || status == ObuSoftwareUpgradeStatus.PACKAGE_UPLOAD_FAILED
+            || status == ObuSoftwareUpgradeStatus.EXEC_UPGRADE_PROGRAM_FAILED || status == ObuSoftwareUpgradeStatus.UNKNOWN) {
+
+            UiThreadHandler.post {
+                var isDeleteSuccess = FileUtils.delete(Config.downLoadObuPath)
+                var isDeleteUnzipSuccess = FileUtils.delete(Config.downLoadUnzipObuPath)
+                Log.d("liyz",
+                    "onUpgradeStatus ---isDeleteSuccess = $isDeleteSuccess ---isDeleteUnzipSuccess = $isDeleteUnzipSuccess")
+            }
+        }
+    }
+
+    /**
+     * 当前的obu版本
+     */
+    override fun onCurrentVersion(version: MogoObuSystemBConfigData) {
+        Log.e("liyz", "onCurrentVersion version = ${version.version}")
+        if (!version.version.isNullOrEmpty()) {
+            mVersionName = version.version
+            CallerDevaToolsManager.queryObuUpgrade(version.version)
+        }
+    }
+
+    /**
+     * 监听obu
+     */
+    fun readSystemConfig() {
+        ObuManager.getInstance().readSystemBConfig(mContext, MogoObuConst.OBU_DEFAULT_IP, this)
+    }
+
+    /**
+     * 传递obu升级包给硬件
+     * @param upgradePackage 升级包文件绝对路径 只能包含 升级包MD5文件和升级包文件
+     * @param isUpgradeNow   是否立即升级
+     *                       false：OBU设备下次上电时执行升级程序
+     *                       ture: OBU设备立即执行升级程序 TODO 警告：执行立即升级时请确保车辆是静止状态。车辆在运行过程中升级设备可能会影响驾驶，严重时可能造成安全隐患！！！
+     * @param listener       升级回调
+     * @return 是否调用成功
+     */
+    fun uploadObuPack(filePathArray: Array<String>) {
+        Log.d("liyz", " filePathArray = $filePathArray")
+        ObuManager.getInstance().uploadUpgradePackage(MogoObuConst.OBU_DEFAULT_IP, filePathArray,false,this)
+    }
+
     /**
      * 断开新obu
      */
@@ -101,6 +163,9 @@ class MogoPrivateObuNewManager private constructor() {
         return ObuManager.getInstance().connectStatus == MogoObuConstants.CONNECT_STATUS.CONNECTED
     }
 
+    /**
+     * 设置obu sdk日志的输出
+     */
     fun setObuLog(isChecked: Boolean) {
         ObuManager.getInstance().setEnableLog(isChecked)
         val builder: MogoObuLog.Builder =
@@ -111,6 +176,9 @@ class MogoPrivateObuNewManager private constructor() {
         ObuManager.getInstance().logConfig(builder.build())
     }
 
+    /**
+     * obu 回调监听
+     */
     private val mogoObuListener: OnObuListener = object : OnObuListener {
         /**
          * 连接状态的改变

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

@@ -227,4 +227,7 @@ class DevaToolsProvider : IDevaToolsProvider {
         bindingCarManager.queryAppUpgrade()
     }
 
+    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

@@ -11,6 +11,7 @@ import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.config.HmiBuildConfig
 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
@@ -59,9 +60,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)
         }
     }
 
@@ -159,21 +157,21 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener {
         }
 
     /**
-     * 查询app是否需要升级
+     * 查询app是否需要升级 TODO 打开升级 注释
      */
     fun queryAppUpgrade() {
 //        UpgradeAppNetWorkManager.getInstance()
 //            .getAppUpgradeInfo(mContext, mAddress, role.toString() + "")
 
-        ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, "")
     }
 
     /**
      * 司机屏 处理obu升级即可,乘客屏不需要处理
-     *
+     * obu的升级,只需要司机屏连接
      */
-    private fun queryObuUpgrade(macAddress: String) {
-//        ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, macAddress)
+    fun queryObuUpgrade(obuVersionName: String) {
+        Log.d("liyz", "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

@@ -8,6 +8,7 @@ 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.network.MoGoRetrofitFactory;
 import com.mogo.eagle.core.network.utils.GsonUtil;
@@ -50,21 +51,14 @@ public class ObuUpgradeAppNetWorkManager {
     /**
      * 获取obu升级信息，obu升级服务端使用app升级接口，根据screenType区分类型
      * mac ：工控机mac地址， TODO 立即升级，还是
-     * screenType ： 类型  liyz
+     * screenType ： 类型
      */
-    public void getObuUpgradeInfo(Context context, String mac) {
+    public void getObuUpgradeInfo(Context context, String mac, String versionName) {
 //        String sn = "X20202203105S688HZ";
+        String mac1 = "48:b0:2d:4d:33:40"; //liyz
 
-//        MogoObuManager().getInstance().readSystemBConfig(context, obuIp, listener)
-
-        //obuIp？
-//        MogoObuManager().getInstance().uploadUpgradePackage(obuIp, upgradePackage, listener)
-
-        Log.e("liyz", "ObuUpgradeAppNetWorkManager  getObuUpgradeInfo -----------> ");
-        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 = " + mac1 + " ---sn = " + sn + " ---obuVersionName = " + obuVersionName);
+        CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo mac = " + mac1 + " ---sn = " + sn + " ---versionName = " + versionName);
         UpgradeAppRequest request = new UpgradeAppRequest(sn, mac1, "7");
         RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
         mUpgradeApiService.getUpgradeInfo(requestBody)
@@ -78,11 +72,12 @@ public class ObuUpgradeAppNetWorkManager {
                     @Override
                     public void onNext(@NonNull UpgradeAppInfo info) {
                         if (info != null && info.result != null) {
-                            CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo appFileName = " + info.result.getAppFileName() + " ----url = " + info.result.getAppUrl() + " ----name = " + info.result.getVersionName() + " --obuVersionName =" + obuVersionName + " ---info.result = " + info.result);
-                            Log.d("liyz", "getObuUpgradeInfo appFileName = " + info.result.getAppFileName() + " ----url = " + info.result.getAppUrl() + " ----name = " + info.result.getVersionName() + " --obuVersionName =" + obuVersionName + " ---info.result = " + info.result);
-//                            if (!String.valueOf(info.result.getVersionName()).equals(obuVersionName)) { //判断是否下载,当文件名称不一致的时候，就下载 TODO
+                            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);
+                            Log.d("liyz", "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)) { //判断是否下载,当文件名称不一致的时候，就下载 TODO liyz
+                                Log.d("liyz", "getObuUpgradeInfo ------2------  ");
                                 CallerDevaToolsManager.INSTANCE.downLoadPackage(info.result.getAppFileName(), 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

@@ -5,9 +5,11 @@ 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
@@ -93,10 +95,8 @@ class UpgradeManager : IDownload {
         }
         if (downloadUrl != null) {
             if (map.isNullOrEmpty()) {
-                Log.d("liyz", "onFinished ----1------")
                 CallerDevaToolsUpgradeListenerManager.invokeUpgradeFinish(downloadUrl)
             } else {
-                Log.d("liyz", "onFinished ----2------")
                 findKey(downloadUrl) {
                     CallerDevaToolsUpgradeListenerManager.invokeUpgradeFinish(it)
                 }
@@ -106,7 +106,6 @@ class UpgradeManager : IDownload {
 
     override fun onError(downloadUrl: String?, errorMsg: String?) {
         CallerLogger.d("$M_DEVA$TAG","onError downloadUrl : $downloadUrl ,  errorMsg : $errorMsg")
-        Log.e("liyz","onError downloadUrl : $downloadUrl ,  errorMsg : $errorMsg")
         if (downloadUrl != null) {
             if (map.isNullOrEmpty()) {
                 CallerDevaToolsUpgradeListenerManager.invokeUpgradeError(downloadUrl, errorMsg ?: "未知错误")
@@ -121,7 +120,6 @@ class UpgradeManager : IDownload {
     private fun findKey(downloadUrl: String?, findResult: (downloadUrl: String) -> Unit) {
         downloadUrl?.let { url ->
             map?.iterator()?.forEach {
-                Log.d("liyz", "findKey  it.value = ${it.value} ----url = $url")
                 if (it.value == url) {
                     findResult.invoke(it.key)
                 }
@@ -178,23 +176,30 @@ class UpgradeManager : IDownload {
                 override fun onFinished(url: String?) {
                     //下载完成，解压文件
                     try {
-                        ///storage/emulated/0/obu/MOGO_OBUAPPS_V503A_PACK.zip
-                        Log.d("liyz", " onFinished file = ${Config.downLoadObuPath + mDownloadFileName} ")
+                        // storage/emulated/0/obu/MOGO_OBUAPPS_V503A_PACK.zip
                         val files = ZipUtils.unzipFile(Config.downLoadObuPath + mDownloadFileName, Config.downLoadUnzipObuPath)
-                        Log.d("liyz", " onFinished files = $files ")
-                        //1传给obu升级,升级成功，2需要删除相应文件夹 TODO
+                        Log.d("liyz", " onFinished file = ${Config.downLoadObuPath + mDownloadFileName} -----files = $files ")
+                        //1传给obu升级,升级成功，2需要删除相应文件夹
 //                        onFinished files = [/storage/emulated/0/obuunzip/MOGO_OBUAPPS_V503A_PATCH.tar.gz, /storage/emulated/0/obuunzip/README.txt, /storage/emulated/0/obuunzip/version.json]
-
-
+                        var md5Path = ""
+                        var tarPath = ""
+                        for (f in files) {
+                            if (f.path.contains(".md5")) {
+                                md5Path = f.path
+                            }
+                            if (f.path.contains(".gz")) {
+                                tarPath = f.path
+                            }
+                        }
+                        Log.d("liyz", "---md5Path = $md5Path -----tarPath = $tarPath ")
+                        CallerObuApiManager.uploadObuPack(arrayOf(md5Path, tarPath))
                     } catch (e: IOException) {
                         //解压失败
-                        Log.e("liyz", "unzip failed -----> ")
                         e.printStackTrace()
                     }
                 }
 
                 override fun onError(url: String?, errorMsg: String?) {
-                    Log.d("liyz", " onProgress errorMsg = $errorMsg ")
                 }
             })
     }

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

@@ -54,7 +54,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
             clearMessageBoxTable();
             CallerMsgBoxManager.INSTANCE.queryAllMessages(this);
         }
-//        CallerDevaToolsManager.INSTANCE.updateUpgradeProgress();
+//        CallerDevaToolsManager.INSTANCE.updateUpgradeProgress(); //liyz 记得打开
         CallerDevaToolsManager.INSTANCE.updateObuUpgradeStatus();
     }