From 7e25e5b43d377bb7eeefcbe7e649d246db05dc7f Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Thu, 9 Feb 2023 15:00:02 +0800 Subject: [PATCH] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E4=B9=8B=E5=89=8Dobu=E7=9A=84v2i=E6=80=BB=E7=9A=84=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zhidao/adas/client/ui/MainActivity.java | 6 -- .../zhidao/adas/magic/ui/MainActivity.java | 5 - .../autopilot/adapter/MoGoAdasListenerImpl.kt | 10 -- .../binding/BindingCarManager.kt | 12 ++- .../upgrade/ObuUpgradeAppNetWorkManager.java | 95 +++++++++++++++++++ .../support/adas/high/OnAdasListener.java | 8 -- .../adas/high/msg/ObuWarningDataMessage.java | 2 +- 7 files changed, 107 insertions(+), 31 deletions(-) create mode 100644 core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java diff --git a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java index bc9235444e..9328ef128c 100644 --- a/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java +++ b/app_ipc_monitoring/src/main/java/com/zhidao/adas/client/ui/MainActivity.java @@ -1031,12 +1031,6 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas DataDistribution.getInstance().addData(base); } - @Override - public void onObuWarningData(MessagePad.Header header, ObuWarningEvent.ObuWarningData obuWarningData) { - ObuWarningData base = new ObuWarningData(header, obuWarningData, sdf); - DataDistribution.getInstance().addData(base); - } - @Override public void onoObuSpatWarning(MessagePad.Header header, ObuScene.SpatWarningData spatWarningData) { diff --git a/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java b/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java index 43df01c887..9880114ebe 100644 --- a/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java +++ b/app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/ui/MainActivity.java @@ -546,11 +546,6 @@ public class MainActivity extends BaseActivity implements OnAdasListener, OnAdas } - @Override - public void onObuWarningData(MessagePad.Header header, ObuWarningEvent.ObuWarningData obuWarningData) { - - } - @Override public void onoObuSpatWarning(MessagePad.Header header, ObuScene.SpatWarningData spatWarningData) { diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index 5e817bc880..ed3c13babb 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -526,16 +526,6 @@ class MoGoAdasListenerImpl : OnAdasListener { } } - /** - * OBU预警事件 - * - * @param header 头 - * @param obuWarningData 数据 - */ - override fun onObuWarningData(header: MessagePad.Header?, obuWarningData: ObuWarningEvent.ObuWarningData?) { - CallerObuDcCombineListenerManager.invokeObuDcData(obuWarningData) - } - /** * OBU 红绿灯预警信息 * 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 9646a3959e..316bb35fec 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 @@ -17,6 +17,7 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.zhjt.mogo_core_function_devatools.upgrade.IPCUpgradeManager.Companion.ipcUpgradeManager +import com.zhjt.mogo_core_function_devatools.upgrade.ObuUpgradeAppNetWorkManager import com.zhjt.mogo_core_function_devatools.upgrade.UpgradeAppNetWorkManager import mogo.telematics.pad.MessagePad @@ -160,4 +161,13 @@ class BindingCarManager : IMoGoAutopilotCarConfigListener { .getAppUpgradeInfo(mContext, mAddress, role.toString() + "") } -} \ No newline at end of file + /** + * 司机屏 处理obu升级即可,乘客屏不需要处理 TODO OBU的角色 + * + */ + fun queryObuUpgrade() { + ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, mAddress, role.toString() + "") + } + +} + 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 new file mode 100644 index 0000000000..c323d84c9e --- /dev/null +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/ObuUpgradeAppNetWorkManager.java @@ -0,0 +1,95 @@ +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 com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.commons.constants.HostConst; +import com.mogo.eagle.core.data.bindingcar.UpgradeAppInfo; +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; +import com.mogo.eagle.core.network.MoGoRetrofitFactory; +import com.mogo.eagle.core.network.utils.GsonUtil; +import com.mogo.eagle.core.utilcode.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; +import io.reactivex.disposables.Disposable; +import io.reactivex.schedulers.Schedulers; +import okhttp3.MediaType; +import okhttp3.RequestBody; + +/** + * @author lixiaopeng + * @description 获取obu升级信息 + * @since: 3/25/22 + */ +public class ObuUpgradeAppNetWorkManager { + private static volatile ObuUpgradeAppNetWorkManager requestNoticeManager; + private final UpgradeApiService mUpgradeApiService; + private static final String TAG = "ObuUpgrade"; + + private ObuUpgradeAppNetWorkManager() { + mUpgradeApiService = MoGoRetrofitFactory.getInstance(HostConst.getHost()) + .create(UpgradeApiService.class); + } + + public static ObuUpgradeAppNetWorkManager getInstance() { + if (requestNoticeManager == null) { + synchronized (ObuUpgradeAppNetWorkManager.class) { + if (requestNoticeManager == null) { + requestNoticeManager = new ObuUpgradeAppNetWorkManager(); + } + } + } + return requestNoticeManager; + } + + /** + * 获取obu升级信息 + * mac ：工控机mac地址 + * screenType ： 类型 + */ + public void getObuUpgradeInfo(Context context, String mac, String screenType) { +// String sn = "X20202203105S688HZ"; +// String mac = "48:b0:2d:3a:bc:78"; + String sn = MoGoAiCloudClientConfig.getInstance().getSn(); + int versionCode = AppUtils.getAppVersionCode(); + CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo mac = " + mac + "---type = " + screenType + "---sn = " + sn + "---versionCode =" + versionCode); + UpgradeAppRequest request = new UpgradeAppRequest(sn, mac, screenType); + RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); + mUpgradeApiService.getUpgradeInfo(requestBody) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(@NonNull Disposable d) { + } + + @Override + public void onNext(@NonNull UpgradeAppInfo info) { + if (info != null && info.result != null) { + CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo url = " + info.result.getAppUrl() + "----code = " + info.result.getVersionCode() + "--versionCode =" + versionCode + "--info.result = " + info.result); + if (info.result.getVersionCode() > versionCode) { + CallerHmiManager.INSTANCE.showUpgradeDialog(info.result.getAppUrl().substring(info.result.getAppUrl().lastIndexOf("/")+1), info.result.getAppUrl(), info.result.getInstallTitle(), info.result.getInstallContent(), info.result.getInstallType()); + } + } else { + CallerLogger.INSTANCE.d(M_BINDING + TAG, "getObuUpgradeInfo onNext info == null"); + } + } + + @Override + public void onError(Throwable e) { + + } + + @Override + public void onComplete() { + } + }); + + } + +} diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java index 91cfec766c..c0e67529b8 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/OnAdasListener.java @@ -195,14 +195,6 @@ public interface OnAdasListener { */ void onPlanningActionMsg(MessagePad.Header header, MessagePad.PlanningActionMsg planningActionMsg); - /** - * OBU预警事件 - * - * @param header 头 - * @param obuWarningData 数据 - */ - void onObuWarningData(MessagePad.Header header, ObuWarningEvent.ObuWarningData obuWarningData); - /** * OBU 红绿灯预警信息 * diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/ObuWarningDataMessage.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/ObuWarningDataMessage.java index e07f3d0f2e..29f364d901 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/ObuWarningDataMessage.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/ObuWarningDataMessage.java @@ -26,7 +26,7 @@ public class ObuWarningDataMessage extends MyAbstractMessageHandler { if (CupidLogUtils.isEnableLog()) nowTime = SystemClock.elapsedRealtime(); if (adasListener != null) { - adasListener.onObuWarningData(raw.getHeader(), obuWarningData); +// adasListener.onObuWarningData(raw.getHeader(), obuWarningData); } AdasChannel.calculateTimeConsumingBusiness("OBU预警事件", nowTime);