diff --git a/config.gradle b/config.gradle index a3a3365cb6..fd6c3654d8 100644 --- a/config.gradle +++ b/config.gradle @@ -112,8 +112,8 @@ ext { // obu sdk obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3", - mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.19', - mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.10', + mogoobu : 'com.zhidao.support.obu:mogoobu:1.0.0.21', + mogoami : 'com.zhidao.support.obu.ami:mogoami:1.0.0.12', adasHigh : 'com.zhidao.support.adas:high:1.2.1.2_bate25', // google diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java index af47a65bcb..cc6dff921c 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoHandAdasMsgManager.java @@ -137,10 +137,8 @@ public class MoGoHandAdasMsgManager implements @Override public void onAutopilotCarConfig(@NotNull MessagePad.CarConfigResp carConfigResp) { -// Log.d("liyz", "onAutopilotCarConfig ----------1-----------"); if (carConfigResp != null && !TextUtils.isEmpty(carConfigResp.getMacAddress())) { -// Log.d("liyz", "onAutopilotCarConfig ----------2-----------" + carConfigResp.getMacAddress() + "--" + carConfigResp.getPlateNumber()); - CallerLogger.INSTANCE.d(M_DEVA + TAG, " carConfigResp.getMacAddress() = " + carConfigResp.getMacAddress() + "--mac = " + carConfigResp.getMacAddress().replaceAll(".{2}(?=.)", "$0:")); +// Log.d("liyz", "onAutopilotCarConfig ---------------------" + carConfigResp.getMacAddress() + "--" + carConfigResp.getPlateNumber()); // CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress()); } } 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 b44a45689e..f1d1008600 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 @@ -51,22 +51,35 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { @Override public void getBindingcarInfo(String macAddress) { mAddress = macAddress; - BindingcarNetWorkManager.getInstance().getBindingcarInfo(mContext, macAddress, getScreenType()); + long currentHour = System.currentTimeMillis() / (1000 * 60 * 60); + long oldHour = SharedPrefsMgr.getInstance(mContext).getLong("type", 0); + Log.d("liyz", "getBindingcarInfo currentHour = " + currentHour + "---oldHour = " + oldHour); + //12小时内只调用一次，防止用户不点击修改绑定导致的频繁提示，用户第一次点击修改成功后，就不会再提示了 + if (currentHour - oldHour > 12) { + if (getScreenType() == 1) { + Log.d("liyz", "getBindingcarInfo getScreenType() -----> "); + SharedPrefsMgr.getInstance(mContext).putLong("type", System.currentTimeMillis() / (1000 * 60 * 60)); + BindingcarNetWorkManager.getInstance().getBindingcarInfo(mContext, macAddress, getScreenType()); + } + } } @Override public void modifyCarInfo(BindingcarCallBack callBack) { - BindingcarNetWorkManager.getInstance().modifyBindingcar(mAddress, callBack, getScreenType()); + if (getScreenType() == 1) { + BindingcarNetWorkManager.getInstance().modifyBindingcar(mAddress, callBack, getScreenType()); + } } - private int getScreenType () { + private int getScreenType() { int screenType = -1; if (FunctionBuildConfig.appIdentityMode == 0 || FunctionBuildConfig.appIdentityMode == 0xA0) { - screenType = 1; //司机屏 + screenType = 1; //司机屏 } else if (FunctionBuildConfig.appIdentityMode == 1 || FunctionBuildConfig.appIdentityMode == 0xA1) { screenType = 2; //乘客屏 } + Log.d("liyz", "mode = " + FunctionBuildConfig.appIdentityMode + "--screenType = " + screenType); return screenType; } 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 055ced59ab..35eb82aa10 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 @@ -57,11 +57,8 @@ public class BindingcarNetWorkManager { * @param macAddress mac地址 */ public void getBindingcarInfo(Context context, String macAddress, int screenType) { - if (screenType == 2) { - return; - } String sn = MoGoAiCloudClientConfig.getInstance().getSn(); - BindingcarRequest request = new BindingcarRequest(macAddress, sn); + 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) .subscribeOn(Schedulers.io()) @@ -75,6 +72,7 @@ public class BindingcarNetWorkManager { public void onNext(@NonNull BindingcarInfo info) { if (info != null && info.getData() != null) { CallerLogger.INSTANCE.d(TAG, "getBindingcarInfo onNext info.getData() =" + info.getData().toString()); + Log.d("liyz", "getBindingcarInfo onNext info.getData() =" + info.getData().toString() + "--compare = " + info.getData().getCompare()); if (info.getData().getCompare() == 0) { CallerHmiManager.INSTANCE.showBindingcarDialog(); } else if (info.getData().getCompare() == 3) { @@ -88,6 +86,7 @@ public class BindingcarNetWorkManager { @Override public void onError(@NonNull Throwable e) { CallerLogger.INSTANCE.e(TAG, "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); + Log.e("liyz", "getBindingcarInfo onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } @Override @@ -102,14 +101,8 @@ public class BindingcarNetWorkManager { * mac: 48:b0:2d:3a:9c:19 */ public void modifyBindingcar(String macAddress, BindingcarCallBack callBack, int screenType) { - Log.d("liyz", "modifyBindingcar screenType = " + screenType); - if (screenType == 2) { - return; - } - Log.d("liyz", "modifyBindingcar --------1----------- "); - String sn = MoGoAiCloudClientConfig.getInstance().getSn(); - BindingcarRequest request = new BindingcarRequest(macAddress, sn); + BindingcarRequest request = new BindingcarRequest(macAddress, sn, screenType); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); mBindingcarApiService.modifyBindingcarInfo(token, requestBody) .subscribeOn(Schedulers.io()) @@ -124,11 +117,13 @@ public class BindingcarNetWorkManager { if (info != null) { 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()); } } @Override public void onError(@NonNull Throwable e) { + Log.e("liyz", "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); CallerLogger.INSTANCE.e(TAG, "modifyBindingcar onError e = " + e.toString() + "---e.getMessage = " + e.getMessage()); } diff --git a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarRequest.java b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarRequest.java index e697f221ee..ea9d1bb8f4 100644 --- a/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarRequest.java +++ b/core/function-impl/mogo-core-function-bindingcar/src/main/java/com/mogo/eagle/core/function/bindingcar/network/BindingcarRequest.java @@ -8,10 +8,12 @@ package com.mogo.eagle.core.function.bindingcar.network; public class BindingcarRequest { private String mac; private String sn; + private int type; - public BindingcarRequest(String mac, String sn) { + public BindingcarRequest(String mac, String sn, int type) { this.mac = mac; this.sn = sn; + this.type = type; } public String getMac() { @@ -30,11 +32,20 @@ public class BindingcarRequest { this.sn = sn; } + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + @Override public String toString() { return "BindingcarRequest{" + "mac='" + mac + '\'' + ", sn='" + sn + '\'' + + ", type=" + type + '}'; } }