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 cc6dff921c..ae74990e6d 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 @@ -138,8 +138,8 @@ 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() + "--" + carConfigResp.getPlateNumber()); -// CallerBindingcarManager.getBindingcarProvider().getBindingcarInfo(carConfigResp.getMacAddress()); + Log.d("liyz", "onAutopilotCarConfig ---------------------" + carConfigResp.getMacAddress() + "--lateNumber() = " + 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 f1d1008600..90e5188004 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 @@ -1,17 +1,15 @@ package com.mogo.eagle.core.function.bindingcar; import android.content.Context; -import android.text.TextUtils; import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.commons.constants.SharedPrefsConstants; import com.mogo.eagle.core.data.config.FunctionBuildConfig; +import com.mogo.eagle.core.data.config.HmiBuildConfig; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.function.api.bindingcar.BindingcarCallBack; import com.mogo.eagle.core.function.api.bindingcar.IMoGoBindingcarProvider; import com.mogo.eagle.core.function.bindingcar.network.BindingcarNetWorkManager; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import org.jetbrains.annotations.NotNull; @@ -51,14 +49,8 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { @Override public void getBindingcarInfo(String macAddress) { mAddress = macAddress; - 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 (HmiBuildConfig.isShowSnBindingView) { if (getScreenType() == 1) { - Log.d("liyz", "getBindingcarInfo getScreenType() -----> "); - SharedPrefsMgr.getInstance(mContext).putLong("type", System.currentTimeMillis() / (1000 * 60 * 60)); BindingcarNetWorkManager.getInstance().getBindingcarInfo(mContext, macAddress, getScreenType()); } } @@ -79,7 +71,6 @@ public class BindingcarProvider implements IMoGoBindingcarProvider { } 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-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index dec6be311d..0bca95478c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.hmi.ui import android.animation.Animator import android.os.Bundle import android.text.TextUtils +import android.util.Log import android.view.Gravity import android.view.View import android.view.WindowManager @@ -869,6 +870,10 @@ class MoGoHmiFragment : MvpFragment HmiBuildConfig.isShowBrakeLightView = isOpen } + override fun setSnBinding(isOpen: Boolean) { + HmiBuildConfig.isShowSnBindingView = isOpen + } + /** * 展示工控机下载、升级状态信息 * @param upgradeMode 升级模式(提示升级、静默升级) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 5388e1be4f..5ef8b3ee57 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -889,6 +889,18 @@ class DebugSettingView @JvmOverloads constructor( CallerHmiManager.setBrakeLightFunction(false) } } + + /** + * sn绑定控制 + */ + tbOpenSnBinding.setOnCheckedChangeListener { buttonView, isChecked -> + if (!isChecked) { + CallerHmiManager.setSnBinding(true) + } else { + CallerHmiManager.setSnBinding(false) + } + } + } /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 46fccc0a60..5807b35fb9 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -938,6 +938,16 @@ android:textOn="打开「刹车控制」" android:textSize="@dimen/dp_24" /> +