[2.13.0] add func of binding car change model

app/build.gradle

@@ -201,6 +201,8 @@ android {
             buildConfigField 'String', 'WORKING_BRANCH_NAME', getWorkingBranchName()
             buildConfigField 'String', 'WORKING_BRANCH_HASH', getWorkingBranchHash()
             buildConfigField 'String', 'APP_BUILD_TIME', getBuildTime()
+            buildConfigField 'String', 'MAP_SDK_VERSION', "\"${MAP_SDK_VERSION}\""
+            buildConfigField 'String', 'MAP_SDK_OPT_VERSION', "\"${MAP_SDK_OPERATION_VERSION}\""
         }
         // 配置网络环境，QA、线上、演示
         qa {

app/src/main/java/com/mogo/launcher/stageone/ConfigStartUp.kt

@@ -55,6 +55,8 @@ class ConfigStartUp : AndroidStartup<Boolean>() {
         DebugConfig.setCarMachineType(BuildConfig.CAR_MACHINE_TYPE)
         DebugConfig.setProductFlavor(BuildConfig.FLAVOR_product)
         DebugConfig.setSocketAppId(BuildConfig.SOCKET_APP_ID)
+        DebugConfig.setMapVersion(BuildConfig.MAP_SDK_VERSION)
+        DebugConfig.setMapOptVersion(BuildConfig.MAP_SDK_OPT_VERSION)
         DebugConfig.setNeedUploadCoordinatesInTime(BuildConfig.IS_NEED_UPLOAD_COORDINATES_IN_TIME)
     }
 

app_mogo_magic_ring/src/main/java/com/zhidao/adas/magic/utils/CrashHandler.java

@@ -134,7 +134,7 @@ public class CrashHandler implements UncaughtExceptionHandler {
         // 获取设备参数信息
         getDeviceInfo(mContext);
 //        mLogInfo.put("versionName", String.valueOf(BuildConfig.VERSION_CODE));
-//        mLogInfo.put("versionCode", BuildConfig.VERSION_NAME);
+//        mLogInfo.put("versionCode", BuildConfig.`VERSION_NAME`);
         // 保存日志文件
         String result = saveCrashLogToFile(paramThrowable);
         mDefaultHandler.uncaughtException(paramThread, paramThrowable);

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

@@ -1,37 +0,0 @@
-package com.mogo.eagle.core.function.bindingcar;
-
-import android.content.Context;
-
-import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack;
-import com.mogo.eagle.core.function.bindingcar.network.BindingcarNetWorkManager;
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
-
-/**
- * @author lixiaopeng
- * @description
- * @since: 10/27/21
- */
-public class BindingcarManager {
-    private String TAG = "BindingcarManager";
-    private static BindingcarManager mBindingcarManager;
-    private Context mContext;
-
-    public static synchronized BindingcarManager getInstance() {
-        synchronized (BindingcarManager.class) {
-            if (mBindingcarManager == null) {
-                mBindingcarManager = new BindingcarManager();
-            }
-        }
-        return mBindingcarManager;
-    }
-
-    protected void getBindingcarInfo() {
-    }
-
-    protected void modifyCarInfo(BindingcarCallBack callBack) {
-    }
-
-
-
-}
-

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

@@ -1,5 +1,7 @@
 package com.mogo.eagle.core.function.bindingcar.network;
 
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BINDING;
+
 import android.content.Context;
 import android.util.Log;
 
@@ -7,8 +9,11 @@ import com.mogo.commons.constants.HostConst;
 import com.mogo.commons.constants.SharedPrefsConstants;
 import com.mogo.eagle.core.data.bindingcar.BindingcarInfo;
 import com.mogo.eagle.core.data.bindingcar.ModifyBindingcarInfo;
+import com.mogo.eagle.core.data.config.HdMapBuildConfig;
 import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack;
+import com.mogo.eagle.core.function.bindingcar.R;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
+import com.mogo.eagle.core.function.call.map.CallerHDMapManager;
 import com.mogo.eagle.core.network.MoGoRetrofitFactory;
 import com.mogo.eagle.core.network.utils.GsonUtil;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
@@ -57,9 +62,8 @@ public class BindingcarNetWorkManager {
      * @param macAddress mac地址
      */
     public void getBindingcarInfo(Context context, String macAddress, String widevineIDWithMd5, int screenType) {
-//        String macAddress1 = "48:b0:2d:3a:bc:78";
+//        String macAddress1 = "48:b0:2d:4d:33:40";
-//        String macAddress1 = "48:b0:2d:4d:b9:63";
+//        String sn = "X2020220417KA94QIN";
-//        String sn = "X20202203105S688HZ";
 
         BindingcarRequest request = new BindingcarRequest(macAddress, widevineIDWithMd5, screenType);
         RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request));
@@ -74,36 +78,28 @@ public class BindingcarNetWorkManager {
                     @Override
                     public void onNext(@NonNull BindingcarInfo info) {
                         if (info != null && info.getData() != null) {
-                            CallerLogger.INSTANCE.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString());
+                            CallerLogger.INSTANCE.d(M_BINDING + TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString());
-                            Log.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString());
+                            switch (info.getData().getCompare()) {
-                            if (info.getData().getCompare().equals("0")) {
+                                case "0":
-                                CallerHmiManager.INSTANCE.showBindingcarDialog();
+                                    CallerHmiManager.INSTANCE.showBindingcarDialog();
-                            } else if (info.getData().getCompare().equals("3")) {
+                                    break;
-                                CallerHmiManager.INSTANCE.showModifyBindingcarDialog();
+                                case "3":
-                            } else if (info.getData().getCompare().equals("null")) {
+                                    CallerHmiManager.INSTANCE.showModifyBindingcarDialog();
-                                TipToast.shortTip("当前工控机没有入库");
+                                    break;
+                                case "null":
+                                    TipToast.shortTip("当前工控机没有入库");
+                                    break;
                             }
 
                             //根据车辆类型切换不同的车辆模型,只针对红旗做处理
-//                            if (info.getData().getVendor().equals("一汽红旗")) { //TODO
+                            updateCarVrIconRes(info.getData().getBrandId());
-//                                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.hq_h9);
-//                            }
-
-//                            else if (info.getData().getVendor().equals("东风汽车集团")) {
-//                                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche);
-//                            } else if (info.getData().getVendor().equals("金旅星辰")) {
-//                                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache);
-//                            } else {
-//                                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche);
-//                            }
-
                             SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, GsonUtils.toJson(info.getData()));
                         }
                     }
 
                     @Override
                     public void onError(@NonNull Throwable e) {
-                        CallerLogger.INSTANCE.e(TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
+                        CallerLogger.INSTANCE.e(M_BINDING + TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
                     }
 
                     @Override
@@ -132,14 +128,14 @@ public class BindingcarNetWorkManager {
                     public void onNext(@NonNull ModifyBindingcarInfo info) {
                         if (info != null) {
                             callBack.callBackResult(info);
-                            Log.d(TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString());
+                            CallerLogger.INSTANCE.d(M_BINDING + TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString());
-                            CallerLogger.INSTANCE.d(TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString());
+                            updateCarVrIconRes(info.getBrandId());
                         }
                     }
 
                     @Override
                     public void onError(@NonNull Throwable e) {
-                        CallerLogger.INSTANCE.e(TAG, "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
+                        CallerLogger.INSTANCE.e(M_BINDING + TAG, "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage());
                     }
 
                     @Override
@@ -149,4 +145,30 @@ public class BindingcarNetWorkManager {
 
     }
 
+    private void updateCarVrIconRes(String brandId){
+        if(brandId == null || brandId.isEmpty()){
+            return;
+        }
+        CallerLogger.INSTANCE.d(M_BINDING + TAG,"updateCarVrIconRes : " + brandId);
+        switch (brandId){
+            case "1":
+                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche);
+                HdMapBuildConfig.currentCarVrIconRes =R.raw.chuzuche;
+                break;
+            case "2":
+                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.hq_h9);
+                HdMapBuildConfig.currentCarVrIconRes =R.raw.hq_h9;
+                break;
+            case "3":
+                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache);
+                HdMapBuildConfig.currentCarVrIconRes =R.raw.xiaobache;
+                break;
+            default:
+                CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche);
+                HdMapBuildConfig.currentCarVrIconRes =R.raw.chuzuche;
+                break;
+        }
+
+    }
+
 }

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

@@ -13,7 +13,6 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 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.util.NetworkUtils
-import com.mogo.map.MogoMap
 import com.zhjt.mogo_core_function_devatools.trace.network.StartUpTraceNetWorkModel
 import com.zhjt.service.chain.ChainLog
 import com.zhjt.service.chain.TracingConstants
@@ -35,9 +34,8 @@ object SyncConfig {
             AppConfigInfo.mogoToken = MoGoAiCloudClient.getInstance().aiCloudClientConfig.token
         }
         AppConfigInfo.netMode = DebugConfig.getNetMode()
-        if (MogoMap.getInstance().mogoMap != null) {
+        AppConfigInfo.mapSdkVersion = DebugConfig.getMapVersion()
-            AppConfigInfo.mapSdkVersion = MogoMap.getInstance().mogoMap.mapVersion
+        AppConfigInfo.mapSdkOptVersion = DebugConfig.getMapOptVersion()
-        }
         AppConfigInfo.isConnectNet = NetworkUtils.isConnected(context)
         AppConfigInfo.isConnectSocket = MogoStatusManager.getInstance().isSocketOnLine
         when {
@@ -69,7 +67,7 @@ object SyncConfig {
         startUpTraceModel.report(traceId, {
             traceId = it
         }, {
-            CallerLogger.e("$M_DEVA${"SyncConfig"}","error : $it")
+            CallerLogger.e("$M_DEVA${"SyncConfig"}", "error : $it")
         })
     }
 }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -73,13 +73,11 @@ import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast
 import com.mogo.eagle.core.utilcode.util.*
-import com.mogo.map.MogoMap
 import com.mogo.map.MogoMapUIController
 import com.mogo.map.uicontroller.VisualAngleMode
 import com.mogo.map.uicontroller.VisualAngleMode.*
 import com.mogo.eagle.core.function.business.routeoverlay.*
 import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
-import com.mogo.eagle.core.function.v2x.vip.VipCarManager
 import com.zhidao.easysocket.utils.L
 import com.zhidao.support.adas.high.other.permission.BackgrounderPermission
 import com.zhjt.mogo_core_function_devatools.env.*
@@ -1691,8 +1689,8 @@ class DebugSettingView @JvmOverloads constructor(
         }
         tvIpcVersionInfo.text = "MAP：${mAutoPilotStatusInfo?.dockVersion}"
         tvIpcVersionInfoKey.text = "MAP：${mAutoPilotStatusInfo?.dockVersion}"
-        tvMoGoMapVersion.text = "HD-Map版本：${MogoMap.getInstance().mogoMap.mapVersion}"
+        tvMoGoMapVersion.text = "HD-Map版本：${DebugConfig.getMapVersion()}"
-        tvMoGoMapVersionKey.text = "HD-Map版本：${MogoMap.getInstance().mogoMap.mapVersion}"
+        tvMoGoMapVersionKey.text = "HD-Map版本：${DebugConfig.getMapVersion()}"
         tvGitBranchInfo.text = "Git分支：${AppConfigInfo.workingBranchName}"
         tvAppBuildTimeInfo.text = "版本构建时间：${AppConfigInfo.appBuildTime}"
 

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/MogoMapService.java

@@ -8,7 +8,6 @@ import com.mogo.eagle.core.function.api.map.marker.IMogoMarkerService;
 import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager;
 import com.mogo.map.MogoGeoSearch;
 import com.mogo.map.MogoLocationClient;
-import com.mogo.map.MogoMap;
 import com.mogo.map.MogoMapUIController;
 import com.mogo.map.MogoMarkerManager;
 import com.mogo.map.MogoOverlayManager;
@@ -79,15 +78,6 @@ public class MogoMapService implements IMogoMapService {
         return new MogoTrafficSearch();
     }
 
-    @Override
-    public String getMapVersion() {
-        if (MogoMap.getInstance().getMogoMap() != null) {
-            return MogoMap.getInstance().getMogoMap().getMapVersion();
-        } else {
-            return "0";
-        }
-    }
-
     @Override
     public void init(Context context) {
         CallerVisualAngleManager.INSTANCE.init(context);

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/AppConfigInfo.kt

@@ -28,6 +28,8 @@ object AppConfigInfo {
 
     // 高精地图版本
     var mapSdkVersion: String? = null
+    // 高精地图采集版本
+    var mapSdkOptVersion: String? = null
     var adasSdkVersion: String? = null
     var obuSdkVersion: String? = null
 
@@ -92,6 +94,7 @@ object AppConfigInfo {
                 "Git分支HASH：${workingBranchHash}<br/>" +
                 "<font color='red' size='30'>------------------依赖信息---------------------</font><br/>" +
                 "MAP-SDK版本：${mapSdkVersion}<br/>" +
+                "MAP-OPT-SDK版本：${mapSdkOptVersion}<br/>" +
                 "ADAS-SDK版本：${adasSdkVersion}<br/>" +
                 "OBU-SDK版本：${obuSdkVersion}<br/>" +
                 "<font color='red' size='30'>------------------鉴权信息---------------------</font><br/>" +
@@ -187,6 +190,7 @@ fun AppConfigInfo.toConfigUpload():ConfigUpload{
     configUpload.isConnectSocket = isConnectSocket
     configUpload.isConnectedNetty = isConnectedNetty
     configUpload.mapSdkVersion = mapSdkVersion
+    configUpload.mapSdkOptVersion = mapSdkOptVersion
     configUpload.mogoSN = mogoSN
     configUpload.mogoToken = mogoToken
     configUpload.netMode = netMode

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/ConfigUpload.kt

@@ -14,6 +14,7 @@ class ConfigUpload(
     var uniqueDeviceId: String? = null,
     var widevineIDMd5: String? = null,
     var mapSdkVersion: String? = null,
+    var mapSdkOptVersion: String? = null,
     var adasSdkVersion: String? = null,
     var obuSdkVersion: String? = null,
     var mogoToken: String? = null,

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

@@ -21,6 +21,7 @@ public class CarInfo implements Serializable {
     private String model; //款式
     private String new_version;
     private String brand; //品牌
+    private String brandId; //品牌
     private String energy_type; //驱动类型
     private List<String> passenger; //乘客数量
     private String number_plate; //车牌号
@@ -105,6 +106,14 @@ public class CarInfo implements Serializable {
         this.number_plate = number_plate;
     }
 
+    public String getBrandId() {
+        return brandId;
+    }
+
+    public void setBrandId(String brandId) {
+        this.brandId = brandId;
+    }
+
     @Override
     public String toString() {
         return "CarInfo{" +
@@ -115,6 +124,7 @@ public class CarInfo implements Serializable {
                 ", model='" + model + '\'' +
                 ", new_version='" + new_version + '\'' +
                 ", brand='" + brand + '\'' +
+                ", brandId='" + brandId + '\'' +
                 ", energy_type='" + energy_type + '\'' +
                 ", passenger=" + passenger +
                 ", number_plate='" + number_plate + '\'' +

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

@@ -9,6 +9,7 @@ import com.mogo.eagle.core.data.BaseData;
  */
 public class ModifyBindingcarInfo extends BaseData {
     public String data;
+    public String brandId;
 
     public String getData() {
         return data;
@@ -18,10 +19,19 @@ public class ModifyBindingcarInfo extends BaseData {
         this.data = data;
     }
 
+    public String getBrandId() {
+        return brandId;
+    }
+
+    public void setBrandId(String brandId) {
+        this.brandId = brandId;
+    }
+
     @Override
     public String toString() {
         return "ModifyBindingcarInfo{" +
                 "data='" + data + '\'' +
+                "brandId='" + brandId + '\'' +
                 '}';
     }
 }

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HdMapBuildConfig.kt

@@ -13,7 +13,7 @@ object HdMapBuildConfig {
      * 可以指定，R.raw.chuzuche，R.raw.xiaobache，R.raw.hongqi
      */
     @JvmField
-    var currentCarVrIconRes = R.raw.chuzuche
+    var currentCarVrIconRes = R.raw.hq_h9
 
     /**
      * 地图是否加载成功

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java

@@ -90,9 +90,4 @@ public interface IMogoMapService extends IProvider {
      */
     IMogoTrafficSearch getTrafficSearchApi();
 
-    /**
-     * 获取地图版本号
-     * @return
-     */
-    String getMapVersion();
 }

foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java

@@ -148,6 +148,26 @@ public class DebugConfig {
         return sSocketAppId;
     }
 
+    private static String mapVersion;
+
+    public static void setMapVersion(String mapVersion) {
+        DebugConfig.mapVersion = mapVersion;
+    }
+
+    public static String getMapVersion() {
+        return mapVersion;
+    }
+
+    private static String mapOptVersion;
+
+    public static void setMapOptVersion(String mapOptVersion) {
+        DebugConfig.mapOptVersion = mapOptVersion;
+    }
+
+    public static String getMapOptVersion() {
+        return mapOptVersion;
+    }
+
     /**
      * 是否需要实时上报坐标位置
      */

libraries/mogo-map-api/src/main/java/com/mogo/map/IMogoMap.java

@@ -171,12 +171,6 @@ public interface IMogoMap {
      */
     IMogoPolyline addPolyline( MogoPolylineOptions options );
 
-    /**
-     * 获取地图版本
-     * @return
-     */
-    String getMapVersion();
-
     /**
      * 获取行驶方向一定长度的中心线
      * @param lon 经度

libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java

@@ -19,7 +19,6 @@ import android.location.Location;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.os.SystemClock;
 import android.os.Trace;
 import android.text.TextUtils;
 import android.util.Log;
@@ -45,7 +44,6 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
-import com.mogo.eagle.core.utilcode.util.GsonUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.listener.MogoMapListenerHandler;
 import com.mogo.map.navi.MogoCarLocationChangedListenerRegister;

libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java

@@ -302,11 +302,6 @@ public class AMapWrapper implements IMogoMap {
         return null;
     }
 
-    @Override
-    public String getMapVersion() {
-        return MapAutoApi.INSTANCE.getSDKVersion();
-    }
-
     private boolean checkAMap() {
         mAMap = mMapView.getMapAutoViewHelper();
         sAMap = mAMap;