From 18c39b62a378fbcfb7244ae65585320716c5ba21 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 16 Feb 2023 15:52:04 +0800 Subject: [PATCH] [2.13.2-sop] fix bug of bindcar change icon --- .../bindingcar/BindingcarProvider.java | 2 + .../network/BindingcarNetWorkManager.java | 50 +++++++++++-------- gradle.properties | 4 +- 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java index 0f3a288a2d..b521654bd5 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/BindingcarProvider.java @@ -52,6 +52,8 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { public void init(Context context) { mContext = context; IPCUpgradeManager.Companion.getINSTANCE().initServer(context); + SharedPrefsMgr.getInstance(mContext).putLong("typeDriver", 0); + SharedPrefsMgr.getInstance(mContext).putLong("typePassenger", 0); } /** diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java index 4f563ecc8a..e30ed2e054 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarNetWorkManager.java @@ -3,7 +3,6 @@ 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; import com.mogo.commons.constants.HostConst; import com.mogo.commons.constants.SharedPrefsConstants; @@ -64,8 +63,10 @@ public class BindingcarNetWorkManager { public void getBindingcarInfo(Context context, String macAddress, String widevineIDWithMd5, int screenType) { // String macAddress1 = "48:b0:2d:4d:33:40"; // String sn = "X2020220417KA94QIN"; + String macAddress1 = "48:b0:2d:4d:b6:f1"; + String sn = "202201186832WTE"; - BindingcarRequest request = new BindingcarRequest(macAddress, widevineIDWithMd5, screenType); + BindingcarRequest request = new BindingcarRequest(macAddress1, sn, screenType); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); mBindingcarApiService.getBindingcarInfo(requestBody) .subscribeOn(Schedulers.io()) @@ -80,9 +81,7 @@ public class BindingcarNetWorkManager { if (info != null && info.getData() != null) { CallerLogger.INSTANCE.d(M_BINDING + TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); //根据车辆类型切换不同的车辆模型,只针对红旗做处理 - if (!SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.MAC_ADDRESS).equals(macAddress)) { - updateCarVrIconRes(info.getData().getBrandId()); - } + updateCarVrIconRes(info.getData().getBrandId()); switch (info.getData().getCompare()) { case "0": CallerHmiManager.INSTANCE.showBindingcarDialog(); @@ -95,7 +94,6 @@ public class BindingcarNetWorkManager { break; } SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, GsonUtils.toJson(info.getData())); - SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.MAC_ADDRESS, macAddress); } } @@ -116,9 +114,9 @@ public class BindingcarNetWorkManager { * mac: 48:b0:2d:3a:9c:19 */ public void modifyBindingcar(Context context, String macAddress, String widevineIDWithMd5, BindingcarCallBack callBack, int screenType) { -// String macAddress1 = "48:b0:2d:4d:33:40"; -// String sn = "X2020220417KA94QIN"; - BindingcarRequest request = new BindingcarRequest(macAddress, widevineIDWithMd5, screenType); + String macAddress1 = "48:b0:2d:4d:b6:f1"; + String sn = "202201186832WTE"; + BindingcarRequest request = new BindingcarRequest(macAddress1, sn, screenType); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); mBindingcarApiService.modifyBindingcarInfo(requestBody) .subscribeOn(Schedulers.io()) @@ -133,10 +131,7 @@ public class BindingcarNetWorkManager { if (info != null) { callBack.callBackResult(info); CallerLogger.INSTANCE.d(M_BINDING + TAG, "modifyBindingcar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()); - if (!SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.MAC_ADDRESS).equals(macAddress)) { - updateCarVrIconRes(info.getData().getBrandId()); - } - SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.MAC_ADDRESS, macAddress); + updateCarVrIconRes(info.getData().getBrandId()); } } @@ -152,30 +147,43 @@ public class BindingcarNetWorkManager { } - private void updateCarVrIconRes(String brandId){ - if(brandId == null || brandId.isEmpty()){ + private void updateCarVrIconRes(String brandId) { + if (brandId == null || brandId.isEmpty()) { return; } - CallerLogger.INSTANCE.d(M_BINDING + TAG,"updateCarVrIconRes : " + brandId); - switch (brandId){ + if(getDefaultId().equals(brandId)){ + return; + } + CallerLogger.INSTANCE.d(M_BINDING + TAG, "updateCarVrIconRes : " + brandId); + switch (brandId) { case "1": CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche); - HdMapBuildConfig.currentCarVrIconRes =R.raw.chuzuche; + HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche; break; case "2": CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.hq_h9); - HdMapBuildConfig.currentCarVrIconRes =R.raw.hq_h9; + HdMapBuildConfig.currentCarVrIconRes = R.raw.hq_h9; break; case "3": CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.xiaobache); - HdMapBuildConfig.currentCarVrIconRes =R.raw.xiaobache; + HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache; break; default: CallerHDMapManager.INSTANCE.changeCurrentIcon(R.raw.chuzuche); - HdMapBuildConfig.currentCarVrIconRes =R.raw.chuzuche; + HdMapBuildConfig.currentCarVrIconRes = R.raw.chuzuche; break; } } + private String getDefaultId(){ + if(HdMapBuildConfig.currentCarVrIconRes == R.raw.chuzuche){ + return "1"; + } + if(HdMapBuildConfig.currentCarVrIconRes == R.raw.xiaobache){ + return "3"; + } + return "1"; + } + } diff --git a/gradle.properties b/gradle.properties index 55cf786d9e..086a2be1ea 100644 --- a/gradle.properties +++ b/gradle.properties @@ -93,8 +93,8 @@ WEBSOCKET_VERSION=1.1.7 applicationId=com.mogo.launcer applicationName=IntelligentPilot # RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0 -versionCode=1080400 -versionName=1.8.4 +versionCode=2130400 +versionName=2.13.4 ################# 新架构模块Maven版本管理 ################# MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.58.10