Merge branch 'dev_robotaxi-d-app-module_270_220510_2.7.0' of gitlab.zhidaoauto.com:zhjt/AndroidApp/MoGoEagleEye into dev_robotaxi-d-app-module_270_220510_2.7.0

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java

@@ -106,7 +106,7 @@ public class MoGoHandAdasMsgManager implements
     @Override
     public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) {
         if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) {
-            Log.d("liyz", "onAutopilotCarConfig ---------------------" + carConfigResp.getMacAddress() + "--lateNumber() = " + carConfigResp.getPlateNumber());
+            Log.d("liyz", "onAutopilotCarConfig ---------" + carConfigResp.getMacAddress() + "--lateNumber() = " + carConfigResp.getPlateNumber());
             CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress());
         }
     }

core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java

@@ -60,13 +60,13 @@ public class BindingcarNetWorkManager {
      *
      * @param macAddress mac地址
      */
-    public void getBindingcarInfo(Context context, String macAddress, int screenType) {
-        String sn = DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp());
-//        String macAddress = "48:b0:2d:3a:bc:7";
-//        String sn = "X20202203105S688HZ";
-//        int screenType = 1;
+    public void getBindingcarInfo(Context context, String macAddress1, int screenType1) {
+//        String sn = DeviceIdUtils.getWidevineIDWithMd5(AbsMogoApplication.getApp());
+        String macAddress = "48:b0:2d:3a:bc:7";
+        String sn = "X20202203105S688HZ";
+        int screenType = 1;
 
-        Log.d("liyz", "getBindingcarInfo --- sn = " + sn + "--macAddress = " +macAddress + "--screenType = " + screenType);
+        Log.d("liyz", "getBindingcarInfo -- sn = " + sn + "--macAddress = " +macAddress + "--screenType = " + screenType);
         BindingcarRequest request = new BindingcarRequest(macAddress, sn, screenType);
         RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
         mBindingcarApiService.getBindingcarInfo(token, requestBody)
@@ -100,7 +100,6 @@ public class BindingcarNetWorkManager {
 
                     @Override
                     public void onComplete() {
-                        Log.d("liyz", "getBindingcarInfo onComplete -------- ");
                     }
                 });
 
@@ -130,8 +129,6 @@ public class BindingcarNetWorkManager {
                             callBack.callBackResult(info);
                             CallerLogger.INSTANCE.d(TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString());
                             Log.d("liyz", "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString());
-                        } else {
-                            Log.e("liyz", "modifyBindingcar  info == null");
                         }
                     }
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt

@@ -14,6 +14,7 @@ import com.mogo.eagle.core.function.hmi.WaringConst
 class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() {
     private var mContext: Context? = null
 
+    //adb shell am broadcast -a com.hmi.v2x.trafficlight --ei trafficLightCheckType 1 --ei trafficLightCountDown 0 --ez trafficLightIsShow true
     companion object {
         private const val TAG = "V2XTrafficLightBroadcastReceiver"
     }
@@ -57,9 +58,6 @@ class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() {
      */
     private fun dispatchShowWaring(trafficLightCheckType: Int, trafficLightCountDown: Int) {
         CallerHmiManager.showWarningTrafficLight(trafficLightCheckType)
-        if(trafficLightCountDown == 0 ){
-            CallerHmiManager.disableWarningTrafficLightCountDown()
-        }
         when(trafficLightCheckType){
             1 -> CallerHmiManager.changeCountdownRed(trafficLightCountDown)
             2 -> CallerHmiManager.changeCountdownYellow(trafficLightCountDown)

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt

@@ -99,6 +99,7 @@ class SingleTrafficLightView @JvmOverloads constructor(
                 )
                 mLightTimeTV!!.text = redNum.toString()
             } else {
+                disableCountdown()
                 mLightTimeTV!!.text = ""
             }
         }
@@ -118,6 +119,7 @@ class SingleTrafficLightView @JvmOverloads constructor(
                 )
                 mLightTimeTV!!.text = greenNum.toString()
             } else {
+                disableCountdown()
                 mLightTimeTV!!.text = ""
             }
         }
@@ -137,6 +139,7 @@ class SingleTrafficLightView @JvmOverloads constructor(
                 )
                 mLightTimeTV!!.text = yellowNum.toString()
             } else {
+                disableCountdown()
                 mLightTimeTV!!.text = ""
             }
         }

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/collect/MoGoMapDataCollectProvider.kt

@@ -51,7 +51,7 @@ class MoGoMapDataCollectProvider : IMoGoMapDataCollectProvider, OnTaskListener,
             GatherApi.also { itx ->
             itx.init(it,
                 GatherParams.init()
-                    .setDebugMode(DebugConfig.isDebug())
+                    .setDebugMode(false)
                     .setCoordinateType(GatherParams.COORDINATETYPE_GCJ02))
         } })
         executor.get()?.setOnTaskListener(this)

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/bindingcar/CarInfo.java

@@ -22,6 +22,7 @@ public class CarInfo implements Serializable {
     private String brand; //品牌
     private String energy_type; //驱动类型
     private List<String> passenger; //乘客数量
+    private String number_plate; //车牌号
 
     public String getCompare() {
         return compare;
@@ -95,6 +96,14 @@ public class CarInfo implements Serializable {
         this.passenger = passenger;
     }
 
+    public String getNumber_plate() {
+        return number_plate;
+    }
+
+    public void setNumber_plate(String number_plate) {
+        this.number_plate = number_plate;
+    }
+
     @Override
     public String toString() {
         return "CarInfo{" +
@@ -107,6 +116,7 @@ public class CarInfo implements Serializable {
                 ", brand='" + brand + '\'' +
                 ", energy_type='" + energy_type + '\'' +
                 ", passenger=" + passenger +
+                ", number_plate='" + number_plate + '\'' +
                 '}';
     }
 }

foudations/mogo-commons/build.gradle

@@ -49,7 +49,7 @@ dependencies {
         api rootProject.ext.dependencies.mogoaicloudservicesdk
         api rootProject.ext.dependencies.ttsbase
 
-        implementation rootProject.ext.dependencies.mogo_core_data
+        api rootProject.ext.dependencies.mogo_core_data
         implementation rootProject.ext.dependencies.mogo_core_utils
         api rootProject.ext.dependencies.mogo_core_network
     } else {
@@ -58,7 +58,7 @@ dependencies {
         api project(":tts:tts-base")
 
         implementation project(':core:mogo-core-utils')
-        implementation project(':core:mogo-core-data')
+        api project(':core:mogo-core-data')
         api project(':core:mogo-core-network')
 
     }

test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java

@@ -1,6 +1,7 @@
 package com.mogo.test.crashreport.apm;
 
 import android.content.Context;
+import android.util.Log;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.apm.insight.AttachUserData;
@@ -11,9 +12,13 @@ import com.bytedance.apm.insight.ApmInsight;
 import com.bytedance.apm.insight.ApmInsightAgent;
 import com.bytedance.apm.insight.ApmInsightInitConfig;
 import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
+import com.mogo.commons.constants.SharedPrefsConstants;
+import com.mogo.eagle.core.data.bindingcar.CarInfo;
+import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.util.AppUtils;
 import com.mogo.eagle.core.utilcode.util.CommonUtils;
 import com.mogo.eagle.core.utilcode.util.DeviceIdUtils;
+import com.mogo.eagle.core.utilcode.util.GsonUtils;
 import com.mogo.test.crashreport.CrashReportConstants;
 import com.mogo.test.crashreport.ITestCrashReportProvider;
 
@@ -47,9 +52,19 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider {
                     @Override
                     public Map<? extends String, ? extends String> getUserData(CrashType type) {
                         HashMap<String, String> map = new HashMap<>();
+                        //车辆信息
+                        String carInfoString = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.CAR_INFO);
+                        CarInfo info = GsonUtils.fromJson(carInfoString, CarInfo.class);
+
                         //地图版本
                         String mapSDKVersion = AppUtils.getCustomMapSDKVersion(context);
                         map.put("MAP_SDK_VERSION", mapSDKVersion);
+                        if (info != null) {
+                            Log.d("liyz", "nuber = " + info.getNumber_plate() + "--brand = " + info.getBrand() + "--modle = " + info.getModel());
+                            map.put("PLATE_NUMBER", info.getNumber_plate());
+                            map.put("BRAND", info.getBrand());
+                            map.put("MODEL", info.getModel());
+                        }
                         return map;
                     }
                 });