[dev_arch_opt_3.0] 去掉之前obu的v2i总的回调数据

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) {
 

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) {
 

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 红绿灯预警信息
      *

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() + "")
     }
 
-}
+    /**
+     * 司机屏 处理obu升级即可,乘客屏不需要处理 TODO OBU的角色
+     *
+     */
+    fun queryObuUpgrade() {
+        ObuUpgradeAppNetWorkManager.getInstance().getObuUpgradeInfo(mContext, mAddress, role.toString() + "")
+    }
+
+}
+

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<UpgradeAppInfo>() {
+                    @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() {
+                    }
+                });
+
+    }
+
+}

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 红绿灯预警信息
      *

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);