From de352596afd0f825ee9e971c4b7dfe027de7a1d3 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 22 Feb 2023 15:35:57 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[opt3.0][mogo-obu]=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=8E=A5=E5=8F=A3=E5=92=8C=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 2 +- .../com/zhidao/support/obu/ObuManager.java | 70 +++++++------------ 2 files changed, 26 insertions(+), 46 deletions(-) diff --git a/config.gradle b/config.gradle index fd51e09b27..6d71d31d7c 100644 --- a/config.gradle +++ b/config.gradle @@ -93,7 +93,7 @@ ext { // obu sdk obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", - mogoobu : 'com.mogo.support.obu:mogo-obu:1.1.0_beta1', + mogoobu : 'com.mogo.support.obu:mogo-obu:1.1.0_beta2', // google googlezxing : "com.google.zxing:core:3.3.3", diff --git a/libraries/mogo-obu/src/main/java/com/zhidao/support/obu/ObuManager.java b/libraries/mogo-obu/src/main/java/com/zhidao/support/obu/ObuManager.java index 9af04efdeb..2c95eb0da2 100644 --- a/libraries/mogo-obu/src/main/java/com/zhidao/support/obu/ObuManager.java +++ b/libraries/mogo-obu/src/main/java/com/zhidao/support/obu/ObuManager.java @@ -17,6 +17,7 @@ import com.mogo.support.obu.model.MogoObuRsiWarningData; import com.mogo.support.obu.model.MogoObuRsmWarningData; import com.mogo.support.obu.model.MogoObuRvWarningData; import com.mogo.support.obu.model.MogoObuSpatWarningData; +import com.mogo.support.obu.model.MogoObuSystemBConfigData; import com.mogo.support.obu.model.advance.AccFourAxes; import com.mogo.support.obu.model.advance.DateTime; import com.mogo.support.obu.model.advance.NodeId; @@ -107,14 +108,13 @@ public class ObuManager { /** * 获取当前OBU软件版本 - * 需主动调用获取{@link MogoObuManager#getObuVersion(Context, String, OnUpgradeListener)} * * @return 版本 null表示 无法连接OBU；无法获取版本； * @since 1.1.0 */ @Nullable - public String getObuVersion() { - return MogoObuManager.getInstance().getObuVersion(); + public MogoObuSystemBConfigData getObuSystemBConfig() { + return MogoObuManager.getInstance().getObuSystemBConfig(); } /** @@ -271,64 +271,43 @@ public class ObuManager { /** - * 检查更新 + * 获取OBu配置信息 * * @param obuIp OBU IP * @param listener 升级回调 - * @since 1.1.0 - */ - public boolean checkObuUpgrade(@NonNull Context context, @NonNull String obuIp, OnUpgradeListener listener) { - return MogoObuManager.getInstance().checkObuUpgrade(context, obuIp, listener); - } - - /** - * 检查更新 - * - * @param context 上下文 - * @param obuIp OBU IP - * @param isUpgradeNow 是否立即升级 - * false：OBU设备下次上电时执行升级程序 - * ture: OBU设备立即执行升级程序 TODO 警告：执行立即升级时请确保车辆是静止状态。车辆在运行过程中升级设备可能会影响驾驶，严重时可能造成安全隐患！！！ - * @param listener 升级回调 - * @return 是否调用成功 - * @since 1.1.0 - */ - public boolean checkObuUpgrade(@NonNull Context context, @NonNull String obuIp, boolean isUpgradeNow, OnUpgradeListener listener) { - return MogoObuManager.getInstance().checkObuUpgrade(context, obuIp, isUpgradeNow, listener); - } - - /** - * 获取当前连接OBU的版本号 - * 如果调用 {@link MogoObuManager#checkObuUpgrade(Context, String, OnUpgradeListener)}方法可以不用调用此方法，检查更新会获取版本号 - * - * @param context 上下文 - * @param obuIp OBU IP - * @param listener 升级回调 * @return 是否调用成功 * @since 1.1.0 */ - public boolean getObuVersion(@NonNull Context context, @NonNull String obuIp, OnUpgradeListener listener) { - return MogoObuManager.getInstance().getObuVersion(context, obuIp, listener); + public boolean readSystemBConfig(Context context, @NonNull String obuIp, OnUpgradeListener listener) { + return MogoObuManager.getInstance().readSystemBConfig(context, obuIp, listener); } /** - * 传入升级包版本 + * 上传升级包到OBU 非立即执行升级程序 * - * @param newVersion 升级包版本 + * @param obuIp OBU IP + * @param upgradePackage 升级包文件绝对路径 只能包含 升级包MD5文件和升级包文件 + * @param listener 升级回调 * @since 1.1.0 */ - public void setObuUpgradePackageVersion(@NonNull String newVersion) { - MogoObuManager.getInstance().setObuUpgradePackageVersion(newVersion); + public boolean uploadUpgradePackage(@NonNull String obuIp, @NonNull String[] upgradePackage, OnUpgradeListener listener) { + return MogoObuManager.getInstance().uploadUpgradePackage(obuIp, upgradePackage, false, listener); } /** - * 传入升级包 + * 上传升级包到OBU * - * @param newUpgradePackage 升级包文件绝对路径 只能包含 升级包MD5文件和升级包文件 + * @param obuIp OBU IP + * @param upgradePackage 升级包文件绝对路径 只能包含 升级包MD5文件和升级包文件 + * @param isUpgradeNow 是否立即升级 + * false：OBU设备下次上电时执行升级程序 + * ture: OBU设备立即执行升级程序 TODO 警告：执行立即升级时请确保车辆是静止状态。车辆在运行过程中升级设备可能会影响驾驶，严重时可能造成安全隐患！！！ + * @param listener 升级回调 + * @return 是否调用成功 * @since 1.1.0 */ - public void setObuUpgradePackage(@NonNull String[] newUpgradePackage) { - MogoObuManager.getInstance().setObuUpgradePackage(newUpgradePackage); + public boolean uploadUpgradePackage(@NonNull String obuIp, @NonNull String[] upgradePackage, boolean isUpgradeNow, OnUpgradeListener listener) { + return MogoObuManager.getInstance().uploadUpgradePackage(obuIp, upgradePackage, isUpgradeNow, listener); } /** @@ -336,10 +315,11 @@ public class ObuManager { * * @since 1.1.0 */ - public void stopObuUpgrade() { - MogoObuManager.getInstance().stopObuUpgrade(); + public void stopProcess() { + MogoObuManager.getInstance().stopProcess(); } + private final OnMogoObuListener mogoObuListener = new OnMogoObuListener() { @Override public void onConnectStatus(int connectStatus) { From ff9dc1bc36aec4a641e34e532841c70d40d17588 Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Thu, 23 Feb 2023 10:56:47 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[opt3.0][mogo-obu]=20=E5=8D=87=E7=BA=A7OBU?= =?UTF-8?q?=20SDK=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.gradle b/config.gradle index 6d71d31d7c..1d89d9bc2c 100644 --- a/config.gradle +++ b/config.gradle @@ -93,7 +93,7 @@ ext { // obu sdk obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", - mogoobu : 'com.mogo.support.obu:mogo-obu:1.1.0_beta2', + mogoobu : 'com.mogo.support.obu:mogo-obu:1.1.0_beta3', // google googlezxing : "com.google.zxing:core:3.3.3", From 2efb14e5f5307b1540c34c93686532e681a30416 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 23 Feb 2023 14:43:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../binding/BindingCarManager.kt | 8 ++-- .../upgrade/ObuUpgradeAppNetWorkManager.java | 30 +++++++++------ .../upgrade/UpgradeManager.kt | 37 ++++++++++++++----- .../function/main/MainMoGoApplication.java | 2 +- .../eagle/core/data/bindingcar/AppInfo.java | 10 +++++ .../core/utilcode/breakpoint/Config.java | 3 ++ .../breakpoint/thread/DownloadTask.java | 2 + .../breakpoint/thread/DownloadThread.java | 5 ++- .../breakpoint/utils/DownloadUtils.java | 2 + 9 files changed, 72 insertions(+), 27 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt index 2e08b89f0a..a2db214fb2 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt @@ -162,8 +162,10 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener { * 查询app是否需要升级 */ fun queryAppUpgrade() { - UpgradeAppNetWorkManager.getInstance() - .getAppUpgradeInfo(mContext, mAddress, role.toString() + "") +// UpgradeAppNetWorkManager.getInstance() +// .getAppUpgradeInfo(mContext, mAddress, role.toString() + "") + + ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, "") } /** @@ -171,7 +173,7 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener { * */ private fun queryObuUpgrade(macAddress: String) { - ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, macAddress) +// ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, macAddress) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java index cf5a8832bd..1d143b150b 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java @@ -3,17 +3,16 @@ 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.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,16 +49,23 @@ public class ObuUpgradeAppNetWorkManager { /** * 获取obu升级信息，obu升级服务端使用app升级接口，根据screenType区分类型 - * mac ：工控机mac地址 - * screenType ： 类型 + * mac ：工控机mac地址， TODO 立即升级，还是 + * screenType ： 类型 liyz */ public void getObuUpgradeInfo(Context context, String mac) { // String sn = "X20202203105S688HZ"; -// String mac = "48:b0:2d:3a:bc:78"; + +// 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 = " + mac + "---sn = " + sn + "---obuVersionName =" + obuVersionName); - UpgradeAppRequest request = new UpgradeAppRequest(sn, mac, "7"); + CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo mac = " + mac1 + " ---sn = " + sn + " ---obuVersionName = " + obuVersionName); + UpgradeAppRequest request = new UpgradeAppRequest(sn, mac1, "7"); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); mUpgradeApiService.getUpgradeInfo(requestBody) .subscribeOn(Schedulers.io()) @@ -72,11 +78,11 @@ 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 =" + 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 + CallerDevaToolsManager.INSTANCE.downLoadPackage(info.result.getAppFileName(), info.result.getAppUrl()); +// } } else { CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo onNext info == null"); } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt index 3fdbdce9b6..9888115ce9 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt @@ -2,6 +2,7 @@ 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.function.api.devatools.IMogoDevaToolsUpgradeListener @@ -29,12 +30,18 @@ class UpgradeManager : IDownload { } private var map: Map? = null + private var mDownloadFileName: String? = null fun downLoadPackage(context: Context, downloadKey: String,downloadUrl: String) { + Log.d("liyz", "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,13 +88,15 @@ 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) { if (map.isNullOrEmpty()) { + Log.d("liyz", "onFinished ----1------") CallerDevaToolsUpgradeListenerManager.invokeUpgradeFinish(downloadUrl) } else { + Log.d("liyz", "onFinished ----2------") findKey(downloadUrl) { CallerDevaToolsUpgradeListenerManager.invokeUpgradeFinish(it) } @@ -97,6 +106,7 @@ 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 ?: "未知错误") @@ -111,6 +121,7 @@ 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) } @@ -119,7 +130,7 @@ class UpgradeManager : IDownload { } /** - * 鹰眼app下载监听 + * 鹰眼app下载监听 liyz */ fun updateUpgradeProgress(context: Context) { val builder = NotificationCompat.Builder(context) @@ -153,7 +164,7 @@ class UpgradeManager : IDownload { } /** - * obu升级包下载监听 + * obu升级包下载监听 liyz */ fun updateObuUpgradeStatus(context: Context) { CallerDevaToolsUpgradeListenerManager.addListener( @@ -162,23 +173,29 @@ 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升级 + ///storage/emulated/0/obu/MOGO_OBUAPPS_V503A_PACK.zip + Log.d("liyz", " onFinished file = ${Config.downLoadObuPath + mDownloadFileName} ") + val files = ZipUtils.unzipFile(Config.downLoadObuPath + mDownloadFileName, Config.downLoadUnzipObuPath) + Log.d("liyz", " onFinished files = $files ") + //1传给obu升级,升级成功，2需要删除相应文件夹 TODO +// onFinished files = [/storage/emulated/0/obuunzip/MOGO_OBUAPPS_V503A_PATCH.tar.gz, /storage/emulated/0/obuunzip/README.txt, /storage/emulated/0/obuunzip/version.json] + } catch (e: IOException) { //解压失败 - + Log.e("liyz", "unzip failed -----> ") e.printStackTrace() } } - override fun onError(url: String?, errorMsg: String?) {} + override fun onError(url: String?, errorMsg: String?) { + Log.d("liyz", " onProgress errorMsg = $errorMsg ") + } }) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 1e80ca8ec3..217aa5e057 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/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(); CallerDevaToolsManager.INSTANCE.updateObuUpgradeStatus(); } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/AppInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/AppInfo.java index 86c04140ab..9e731a91b0 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/AppInfo.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/AppInfo.java @@ -17,6 +17,7 @@ public class AppInfo implements Serializable { private String installType; // 升级类型 1:提示升级 2:静默升级 3:强制升级 private String beginTime; private String endTime; + private String appFileName; public String getAppUrl() { return appUrl; @@ -90,6 +91,14 @@ public class AppInfo implements Serializable { this.endTime = endTime; } + public String getAppFileName() { + return appFileName; + } + + public void setAppFileName(String appFileName) { + this.appFileName = appFileName; + } + @Override public String toString() { return "AppInfo{" + @@ -102,6 +111,7 @@ public class AppInfo implements Serializable { ", installType='" + installType + '\'' + ", beginTime='" + beginTime + '\'' + ", endTime='" + endTime + '\'' + + ", appFileName='" + appFileName + '\'' + '}'; } } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/Config.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/Config.java index 987c395343..b92e60027b 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/Config.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/Config.java @@ -16,5 +16,8 @@ public class Config { public final static String downLoadObuPath = Environment.getExternalStorageDirectory().getAbsolutePath() + "/obu/"; + public final static String downLoadUnzipObuPath = Environment.getExternalStorageDirectory().getAbsolutePath() + + "/obuunzip/"; + public final static String DOWN_LOAD_TAG = "Package-DownLoad"; } diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java index 39604be8b1..c1a1c34310 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java @@ -75,6 +75,7 @@ public class DownloadTask implements DownloadCallBack { } downloadCallBack.startDownload(fileBean.getUrl()); Log.d(DOWN_LOAD_TAG, " 开始下载：" + finishedProgress); + Log.d("liyz", " DownloadTask 开始下载：" + finishedProgress + "---fileBean.getUrl() = " + fileBean.getUrl()); } /** @@ -144,6 +145,7 @@ public class DownloadTask implements DownloadCallBack { } if (threads.size() == 0) {//如果列表size为0 则所有线程已下载完成 Log.d(DOWN_LOAD_TAG, " DownloadTask threadDownLoadFinished 下载完成----->"); + Log.d("liyz", "threadDownLoadFinished ------------ 下载完成-----> "); //删除数据库中的信息 dao.deleteThread(fileBean.getUrl()); //发送下载完成事件 diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java index c20becc8ee..bff247603d 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java @@ -51,11 +51,13 @@ public class DownloadThread extends Thread { int start = threadBean.getStart() + threadBean.getFinished(); connection.setRequestProperty("Range","bytes="+start+"-"+threadBean.getEnd()); //设置写入位置 - File file = new File(Config.downLoadPath,fileBean.getFileName()); + Log.d("liyz", "fileBean.getFileName() = " + fileBean.getFileName() + "---Config.downLoadPath = " + Config.downLoadPath); + File file = new File(fileBean.getFileName().contains(".zip") ? Config.downLoadObuPath : Config.downLoadPath,fileBean.getFileName()); raf = new RandomAccessFile(file,"rwd"); raf.seek(start); //开始下载 Log.d(DOWN_LOAD_TAG, "DownloadThread connection.getResponseCode() = " + connection.getResponseCode() + "---threadBean.getUrl() =" + threadBean.getUrl()); + Log.d("liyz", "DownloadThread connection.getResponseCode() = " + connection.getResponseCode() + "---threadBean.getUrl() =" + threadBean.getUrl()); if(connection.getResponseCode() == HttpURLConnection.HTTP_PARTIAL){ inputStream = connection.getInputStream(); byte[] bytes = new byte[1024]; @@ -77,6 +79,7 @@ public class DownloadThread extends Thread { } } catch (Exception e) { + Log.e("liyz", "DownloadThread ---1---- e = " + e); e.printStackTrace(); DownloadData downloadData = new DownloadData(); downloadData.setUrl(fileBean.getUrl()); diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/utils/DownloadUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/utils/DownloadUtils.java index 05c06c7508..5bc2dd96b7 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/utils/DownloadUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/utils/DownloadUtils.java @@ -2,6 +2,7 @@ package com.mogo.eagle.core.utilcode.breakpoint.utils; import android.content.Context; import android.content.Intent; +import android.util.Log; import com.mogo.eagle.core.utilcode.breakpoint.bean.FileBean; import com.mogo.eagle.core.utilcode.breakpoint.callback.IDownload; @@ -11,6 +12,7 @@ import com.mogo.eagle.core.utilcode.breakpoint.services.DownloadService; public class DownloadUtils { public static void downLoad(Context context, String url, String savePath, String fileName, int downloadThreadCount, IDownload iDownload) { + Log.d("liyz", "---DownloadUtils fileName = " + fileName); FileBean fileBean = new FileBean(0, savePath, fileName, url, 0); fileBean.setThreadCount(downloadThreadCount); Intent startIntent = new Intent(context, DownloadService.class); From 2d4e88394e07e96a116ea75d3f8e042b527a70fc Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 23 Feb 2023 14:52:49 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=BB=9F=E4=B8=80ip=E7=9A=84=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo-core-function-datacenter/README.md | 2 +- .../core/function/datacenter/obu/MoGoObuProvider.kt | 4 ++-- .../datacenter/obu/MogoPrivateObuNewManager.kt | 1 + .../core/function/hmi/ui/setting/DebugSettingView.kt | 3 ++- .../core/function/hmi/ui/setting/SOPSettingView.kt | 3 ++- .../com/mogo/eagle/core/data}/obu/MogoObuConst.java | 11 ++++++++--- 6 files changed, 16 insertions(+), 8 deletions(-) rename core/{function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter => mogo-core-data/src/main/java/com/mogo/eagle/core/data}/obu/MogoObuConst.java (84%) diff --git a/core/function-impl/mogo-core-function-datacenter/README.md b/core/function-impl/mogo-core-function-datacenter/README.md index b17a6584f3..3721fcd10f 100644 --- a/core/function-impl/mogo-core-function-datacenter/README.md +++ b/core/function-impl/mogo-core-function-datacenter/README.md @@ -44,7 +44,7 @@ MogoObuManager.getInstance().init(Context context); ``` ## 连接 ```java -//默认192.168.1.199 +//默认 MogoObuManager.getInstance().connect(); //自定义 IP MogoObuManager.getInstance().connect(String ip); diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt index 3e55c6a63f..6d81921609 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt @@ -4,6 +4,7 @@ import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.data.constants.MoGoConfig import com.mogo.eagle.core.data.constants.MogoServicePaths +import com.mogo.eagle.core.data.obu.MogoObuConst import com.mogo.eagle.core.function.api.obu.IMoGoObuProvider import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU @@ -18,7 +19,6 @@ import com.mogo.eagle.core.utilcode.util.CommonUtils class MoGoObuProvider : IMoGoObuProvider { private val TAG = "MoGoObuProvider" private var mContext: Context? = null - private val taxiObuIp = "192.168.1.199" //obu的taxi和bus的ip已经全部统一成1网段ip override val functionName: String get() = TAG @@ -36,7 +36,7 @@ class MoGoObuProvider : IMoGoObuProvider { mContext = context mContext?.let { val ipAddress = - SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, taxiObuIp) + SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, MogoObuConst.OBU_DEFAULT_IP) //mogo obu MogoPrivateObuNewManager.INSTANCE.connectObu( it, diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt index ec299f6d9c..7958a53b1a 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt @@ -4,6 +4,7 @@ import android.content.Context import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.data.enums.* +import com.mogo.eagle.core.data.obu.MogoObuConst 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 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 05606d4bba..a98dec1829 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -40,6 +40,7 @@ import com.mogo.eagle.core.data.deva.scene.SceneModule import com.mogo.eagle.core.data.enums.TrafficTypeEnum import com.mogo.eagle.core.data.gnss.AccelerationEntity import com.mogo.eagle.core.data.map.MogoLocation +import com.mogo.eagle.core.data.obu.MogoObuConst import com.mogo.eagle.core.data.obu.ObuStatusInfo import com.mogo.eagle.core.data.report.ReportEntity import com.mogo.eagle.core.function.api.autopilot.* @@ -559,7 +560,7 @@ internal class DebugSettingView @JvmOverloads constructor( // 初始化OBU IP信息 val ipAddress = - SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, "192.168.1.199") + SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, MogoObuConst.OBU_DEFAULT_IP) etObuIP.setText(ipAddress) etObuIP.text?.let { etObuIP.setSelection(it.length) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index ffd67f3131..116662754b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -8,6 +8,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig +import com.mogo.eagle.core.data.obu.MogoObuConst import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsFuncConfigListener import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager @@ -182,7 +183,7 @@ internal class SOPSettingView @JvmOverloads constructor( tbObu.isChecked = CallerObuApiManager.isConnected() tbObu.setOnCheckedChangeListener { _, isChecked -> if (isChecked) { - CallerObuApiManager.resetObuIpAddress("192.168.1.199") + CallerObuApiManager.resetObuIpAddress(MogoObuConst.OBU_DEFAULT_IP) } else { //断开链接 CallerObuApiManager.disConnectObu() diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuConst.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/MogoObuConst.java similarity index 84% rename from core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuConst.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/MogoObuConst.java index 8134f27b41..0aa418319d 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoObuConst.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/MogoObuConst.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.datacenter.obu; +package com.mogo.eagle.core.data.obu; /** * author : lxiiaopeng @@ -10,10 +10,15 @@ public class MogoObuConst { /** * 自研obu的tag */ - public static final String TAG_MOGO_OBU = "MogoObu"; - public static final String TAG_MOGO_NEW_OBU = "MogoNewObu"; + /** + * 自研obu 默认ip obu的taxi和bus的ip已经全部统一成1网段ip + */ + public static String OBU_DEFAULT_IP = "192.168.1.199"; + + + // OBU 场景测试 // 场景类型 public static String BROADCAST_OBU_TYPE_EXTRA_KEY = "obuType"; From 8275d7f192c18ccaafa2c2cb97936ef2960bbf50 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 24 Feb 2023 15:36:40 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=92=8Cobu=E8=81=94=E8=B0=83=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/obu/MoGoObuProvider.kt | 7 ++ .../obu/MogoPrivateObuNewManager.kt | 70 ++++++++++++++++++- .../DevaToolsProvider.kt | 3 + .../binding/BindingCarManager.kt | 14 ++-- .../upgrade/ObuUpgradeAppNetWorkManager.java | 25 +++---- .../upgrade/UpgradeManager.kt | 29 ++++---- .../function/main/MainMoGoApplication.java | 2 +- .../eagle/core/data/obu/MogoObuConst.java | 4 +- .../api/devatools/IDevaToolsProvider.kt | 5 ++ .../core/function/api/obu/IMoGoObuProvider.kt | 2 + .../call/devatools/CallerDevaToolsManager.kt | 4 ++ .../function/call/obu/CallerObuApiManager.kt | 7 ++ .../breakpoint/thread/DownloadThread.java | 2 - .../breakpoint/utils/DownloadUtils.java | 1 - 14 files changed, 133 insertions(+), 42 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt index 6d81921609..5866e03d0a 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt +++ b/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) { + MogoPrivateObuNewManager.INSTANCE.uploadObuPack(filePathArray) + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt index 7958a53b1a..16f03ac1f7 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt +++ b/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) { + 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 { /** * 连接状态的改变 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index f988d43fcb..93abb3900f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/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) + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt index a2db214fb2..aaea8d5ce2 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt +++ b/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) } } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java index 1d143b150b..ced1c76b54 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java +++ b/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"); } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt index 9888115ce9..8ffb4bc007 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt +++ b/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 ") } }) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 217aa5e057..9cf60e32e6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/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(); } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/MogoObuConst.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/MogoObuConst.java index 0aa418319d..2cd91fbacf 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/MogoObuConst.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/MogoObuConst.java @@ -15,8 +15,8 @@ public class MogoObuConst { /** * 自研obu 默认ip obu的taxi和bus的ip已经全部统一成1网段ip */ - public static String OBU_DEFAULT_IP = "192.168.1.199"; - +// public static String OBU_DEFAULT_IP = "192.168.1.199"; + public static String OBU_DEFAULT_IP = "192.168.0.53"; // OBU 场景测试 diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt index e11938e4bc..40bfff2727 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt @@ -171,6 +171,11 @@ interface IDevaToolsProvider : IProvider { */ fun queryAppUpgrade() + /** + * 查询obu是否有更新 + */ + fun queryObuUpgrade(obuVersionName: String) + fun getEnvConfig(): EnvConfig? fun getEnvCityName():String diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuProvider.kt index 10251bc371..e2af230c6c 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuProvider.kt @@ -16,4 +16,6 @@ interface IMoGoObuProvider : IMoGoFunctionServerProvider { fun isConnected(): Boolean fun setObuLog(isChecked: Boolean) + + fun uploadObuPack(filePathArray: Array) } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt index 37adbfcb54..34054f112d 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/devatools/CallerDevaToolsManager.kt @@ -234,4 +234,8 @@ object CallerDevaToolsManager { fun queryAppUpgrade(){ devaToolsProviderApi?.queryAppUpgrade() } + + fun queryObuUpgrade(obuVersionName: String) { + devaToolsProviderApi?.queryObuUpgrade(obuVersionName) + } } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuApiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuApiManager.kt index 66327389bc..67b18a74b1 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuApiManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/obu/CallerObuApiManager.kt @@ -47,4 +47,11 @@ object CallerObuApiManager { providerApi.setObuLog(isSet) } + /** + * 升级obu硬件 + */ + fun uploadObuPack(filePathArray: Array) { + providerApi.uploadObuPack(filePathArray) + } + } \ No newline at end of file diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java index bff247603d..2fd8b58c3a 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java @@ -51,13 +51,11 @@ public class DownloadThread extends Thread { int start = threadBean.getStart() + threadBean.getFinished(); connection.setRequestProperty("Range","bytes="+start+"-"+threadBean.getEnd()); //设置写入位置 - Log.d("liyz", "fileBean.getFileName() = " + fileBean.getFileName() + "---Config.downLoadPath = " + Config.downLoadPath); File file = new File(fileBean.getFileName().contains(".zip") ? Config.downLoadObuPath : Config.downLoadPath,fileBean.getFileName()); raf = new RandomAccessFile(file,"rwd"); raf.seek(start); //开始下载 Log.d(DOWN_LOAD_TAG, "DownloadThread connection.getResponseCode() = " + connection.getResponseCode() + "---threadBean.getUrl() =" + threadBean.getUrl()); - Log.d("liyz", "DownloadThread connection.getResponseCode() = " + connection.getResponseCode() + "---threadBean.getUrl() =" + threadBean.getUrl()); if(connection.getResponseCode() == HttpURLConnection.HTTP_PARTIAL){ inputStream = connection.getInputStream(); byte[] bytes = new byte[1024]; diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/utils/DownloadUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/utils/DownloadUtils.java index 5bc2dd96b7..59ff2b83e5 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/utils/DownloadUtils.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/utils/DownloadUtils.java @@ -12,7 +12,6 @@ import com.mogo.eagle.core.utilcode.breakpoint.services.DownloadService; public class DownloadUtils { public static void downLoad(Context context, String url, String savePath, String fileName, int downloadThreadCount, IDownload iDownload) { - Log.d("liyz", "---DownloadUtils fileName = " + fileName); FileBean fileBean = new FileBean(0, savePath, fileName, url, 0); fileBean.setThreadCount(downloadThreadCount); Intent startIntent = new Intent(context, DownloadService.class); From d058bcace0191735d48cb045d5087a99095943ef Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 24 Feb 2023 17:32:37 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BC=98=E5=8C=96obu=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/obu/MogoPrivateObuNewManager.kt | 10 ++++------ .../binding/BindingCarManager.kt | 10 ++++++---- .../upgrade/ObuUpgradeAppNetWorkManager.java | 14 ++++++-------- .../upgrade/UpgradeManager.kt | 16 ++++++++++------ .../core/function/main/MainMoGoApplication.java | 2 +- .../mogo/eagle/core/data/obu/MogoObuConst.java | 9 +++++++-- .../utilcode/breakpoint/thread/DownloadTask.java | 2 -- .../breakpoint/thread/DownloadThread.java | 1 - 8 files changed, 34 insertions(+), 30 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt index 16f03ac1f7..725f410695 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt @@ -96,7 +96,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { * 上传obu文件的状态, 升级成功，需要删除obu的文件和解压文件夹 */ override fun onUpgradeStatus(status: ObuSoftwareUpgradeStatus?, t: Throwable?) { - Log.d("liyz", "onUpgradeStatus status = $status ") + CallerLogger.d("$M_OBU${MogoObuConst.TAG_UPGRADE_OBU}", "onUpgradeStatus status = $status ") //上传完成就相当于成功了，立即升级，比上电升级，只是多了一个重启 if (status == ObuSoftwareUpgradeStatus.UPLOAD_FINISH|| status == ObuSoftwareUpgradeStatus.EXEC_UPGRADE_PROGRAM_FINISH || status == ObuSoftwareUpgradeStatus.CONNECTION_FAILED|| status == ObuSoftwareUpgradeStatus.AUTHENTICATION_FAILED @@ -107,8 +107,6 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { UiThreadHandler.post { var isDeleteSuccess = FileUtils.delete(Config.downLoadObuPath) var isDeleteUnzipSuccess = FileUtils.delete(Config.downLoadUnzipObuPath) - Log.d("liyz", - "onUpgradeStatus ---isDeleteSuccess = $isDeleteSuccess ---isDeleteUnzipSuccess = $isDeleteUnzipSuccess") } } } @@ -117,7 +115,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { * 当前的obu版本 */ override fun onCurrentVersion(version: MogoObuSystemBConfigData) { - Log.e("liyz", "onCurrentVersion version = ${version.version}") + CallerLogger.d("$M_OBU${MogoObuConst.TAG_UPGRADE_OBU}", "onCurrentVersion version = ${version.version}") if (!version.version.isNullOrEmpty()) { mVersionName = version.version CallerDevaToolsManager.queryObuUpgrade(version.version) @@ -141,8 +139,8 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { * @return 是否调用成功 */ fun uploadObuPack(filePathArray: Array) { - Log.d("liyz", " filePathArray = $filePathArray") - ObuManager.getInstance().uploadUpgradePackage(MogoObuConst.OBU_DEFAULT_IP, filePathArray,false,this) + CallerLogger.d("$M_OBU${MogoObuConst.TAG_UPGRADE_OBU}", " uploadObuPack filePathArray = $filePathArray") + ObuManager.getInstance().uploadUpgradePackage(MogoObuConst.OBU_DEFAULT_IP, filePathArray,true,this) } /** diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt index aaea8d5ce2..1c032cbf7b 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarManager.kt @@ -9,12 +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 @@ -157,11 +159,11 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener { } /** - * 查询app是否需要升级 TODO 打开升级 注释 + * 查询app是否需要升级 */ fun queryAppUpgrade() { -// UpgradeAppNetWorkManager.getInstance() -// .getAppUpgradeInfo(mContext, mAddress, role.toString() + "") + UpgradeAppNetWorkManager.getInstance() + .getAppUpgradeInfo(mContext, mAddress, role.toString() + "") } @@ -170,7 +172,7 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener { * obu的升级,只需要司机屏连接 */ fun queryObuUpgrade(obuVersionName: String) { - Log.d("liyz", "isConnected = ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress") + CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}","queryObuUpgrade isConnected = ${CallerObuApiManager.isConnected()} --- mAddress = $mAddress") ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, mAddress, obuVersionName) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java index ced1c76b54..08169d44e9 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java @@ -50,16 +50,16 @@ public class ObuUpgradeAppNetWorkManager { /** * 获取obu升级信息，obu升级服务端使用app升级接口，根据screenType区分类型 - * mac ：工控机mac地址， TODO 立即升级，还是 + * mac ：工控机mac地址， * screenType ： 类型 */ public void getObuUpgradeInfo(Context context, String mac, String versionName) { // String sn = "X20202203105S688HZ"; - String mac1 = "48:b0:2d:4d:33:40"; //liyz +// String mac1 = "48:b0:2d:4d:33:40"; String sn = MoGoAiCloudClientConfig.getInstance().getSn(); - CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo mac = " + mac1 + " ---sn = " + sn + " ---versionName = " + versionName); - UpgradeAppRequest request = new UpgradeAppRequest(sn, mac1, "7"); + 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) .subscribeOn(Schedulers.io()) @@ -73,9 +73,7 @@ public class ObuUpgradeAppNetWorkManager { 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 =" + 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------ "); + if (!String.valueOf(info.result.getVersionName()).equals(versionName)) { //判断是否下载,当文件名称不一致的时候，就下载 CallerDevaToolsManager.INSTANCE.downLoadPackage(info.result.getAppFileName(), info.result.getAppUrl()); } } else { @@ -85,7 +83,7 @@ public class ObuUpgradeAppNetWorkManager { @Override public void onError(Throwable e) { - + CallerLogger.INSTANCE.e(M_BINDING + TAG, "getObuUpgradeInfo e = " + e); } @Override diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt index 8ffb4bc007..f8773ed393 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt @@ -15,8 +15,10 @@ 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 @@ -35,7 +37,7 @@ class UpgradeManager : IDownload { private var mDownloadFileName: String? = null fun downLoadPackage(context: Context, downloadKey: String,downloadUrl: String) { - Log.d("liyz", "UpgradeManager downLoadPackage = " + downloadUrl?.contains(".zip") + "----downloadKey = $downloadKey ---downloadUrl = $downloadUrl") + CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", "UpgradeManager downLoadPackage = " + downloadUrl?.contains(".zip") + "----downloadKey = $downloadKey ---downloadUrl = $downloadUrl") if (downloadUrl?.contains(".zip")) { mDownloadFileName = downloadKey } @@ -162,7 +164,7 @@ class UpgradeManager : IDownload { } /** - * obu升级包下载监听 liyz + * obu升级包下载监听 */ fun updateObuUpgradeStatus(context: Context) { CallerDevaToolsUpgradeListenerManager.addListener( @@ -176,11 +178,9 @@ class UpgradeManager : IDownload { override fun onFinished(url: String?) { //下载完成，解压文件 try { - // storage/emulated/0/obu/MOGO_OBUAPPS_V503A_PACK.zip val files = ZipUtils.unzipFile(Config.downLoadObuPath + mDownloadFileName, Config.downLoadUnzipObuPath) - Log.d("liyz", " onFinished file = ${Config.downLoadObuPath + mDownloadFileName} -----files = $files ") + CallerLogger.d("${SceneConstant.M_OBU}${MogoObuConst.TAG_UPGRADE_OBU}", " 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) { @@ -191,10 +191,14 @@ class UpgradeManager : IDownload { tarPath = f.path } } - Log.d("liyz", "---md5Path = $md5Path -----tarPath = $tarPath ") + 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() } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 9cf60e32e6..1e80ca8ec3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/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(); //liyz 记得打开 + CallerDevaToolsManager.INSTANCE.updateUpgradeProgress(); CallerDevaToolsManager.INSTANCE.updateObuUpgradeStatus(); } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/MogoObuConst.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/MogoObuConst.java index 2cd91fbacf..a80d836f78 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/MogoObuConst.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/obu/MogoObuConst.java @@ -15,8 +15,13 @@ public class MogoObuConst { /** * 自研obu 默认ip obu的taxi和bus的ip已经全部统一成1网段ip */ -// public static String OBU_DEFAULT_IP = "192.168.1.199"; - public static String OBU_DEFAULT_IP = "192.168.0.53"; + public static String OBU_DEFAULT_IP = "192.168.1.199"; +// public static String OBU_DEFAULT_IP = "192.168.0.53"; //obu室内环境 + + /** + * obu 升级tag + */ + public static final String TAG_UPGRADE_OBU = "TagUpgradeObu"; // OBU 场景测试 diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java index c1a1c34310..39604be8b1 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadTask.java @@ -75,7 +75,6 @@ public class DownloadTask implements DownloadCallBack { } downloadCallBack.startDownload(fileBean.getUrl()); Log.d(DOWN_LOAD_TAG, " 开始下载：" + finishedProgress); - Log.d("liyz", " DownloadTask 开始下载：" + finishedProgress + "---fileBean.getUrl() = " + fileBean.getUrl()); } /** @@ -145,7 +144,6 @@ public class DownloadTask implements DownloadCallBack { } if (threads.size() == 0) {//如果列表size为0 则所有线程已下载完成 Log.d(DOWN_LOAD_TAG, " DownloadTask threadDownLoadFinished 下载完成----->"); - Log.d("liyz", "threadDownLoadFinished ------------ 下载完成-----> "); //删除数据库中的信息 dao.deleteThread(fileBean.getUrl()); //发送下载完成事件 diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java index 2fd8b58c3a..77be24236a 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/breakpoint/thread/DownloadThread.java @@ -77,7 +77,6 @@ public class DownloadThread extends Thread { } } catch (Exception e) { - Log.e("liyz", "DownloadThread ---1---- e = " + e); e.printStackTrace(); DownloadData downloadData = new DownloadData(); downloadData.setUrl(fileBean.getUrl());