From 29ef184569a36893b91094f5b7677a36918bda3b Mon Sep 17 00:00:00 2001 From: renwj Date: Mon, 6 Mar 2023 20:13:57 +0800 Subject: [PATCH 01/23] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E5=B0=86armea?= =?UTF-8?q?bi-v7a=E6=9E=B6=E6=9E=84=E7=9A=84so=E6=8E=92=E9=99=A4,=20?= =?UTF-8?q?=E5=87=8F=E5=B0=8F=E5=8C=85=E4=BD=93=E7=A7=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index a74eef3605..fcec11c180 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -149,6 +149,7 @@ android { packagingOptions { exclude 'META-INF/proguard/coroutines.pro' exclude 'META-INF/*' + exclude "/lib/armeabi-v7a/*.so" } signingConfigs { From 591c3c23397f52c4defab465ef2cccbf448c1e58 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 7 Mar 2023 16:25:58 +0800 Subject: [PATCH 02/23] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=BF=90=E8=90=A5=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/view_sop_setting.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml index 38db5038ad..cb84b6d654 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml @@ -217,8 +217,8 @@ android:scaleY="1.2" android:scaleX="1.2" app:layout_constraintTop_toBottomOf="@id/tbObuWeaknessTrafficSop" - app:layout_constraintLeft_toRightOf="@id/verticalGuideLine" - app:layout_constraintRight_toRightOf="parent" + app:layout_constraintRight_toLeftOf="@id/verticalGuideLine" + app:layout_constraintLeft_toLeftOf="parent" /> Date: Tue, 7 Mar 2023 17:38:16 +0800 Subject: [PATCH 03/23] =?UTF-8?q?[opt3.0]HttpDNS=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=89=A9=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/biz/dispatch/network/IDispatchAdasApiService.kt | 2 +- .../com/mogo/eagle/function/biz/v2x/road/ILineUploadApi.kt | 2 +- .../com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt | 3 ++- .../function/business/ai/net/AiCloudIdentifyNetWorkModel.kt | 3 ++- .../function/business/ai/net/IAiCloudIdentifyApiService.kt | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/IDispatchAdasApiService.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/IDispatchAdasApiService.kt index dbdc2e34c7..2e1ff638f6 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/IDispatchAdasApiService.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/network/IDispatchAdasApiService.kt @@ -14,7 +14,7 @@ interface IDispatchAdasApiService { * @return [BaseData] */ @FormUrlEncoded - @POST("eagle-eye-dns/eagle-eye-dns/dataService/autoDriver/receiveCarPreSetPath") + @POST("eagle-eye-dns/dataService/autoDriver/receiveCarPreSetPath") fun uploadAutopilotRoute(@FieldMap parameters: Map): Observable /** diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/ILineUploadApi.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/ILineUploadApi.kt index efe9aa66bf..c97a3e6078 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/ILineUploadApi.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/ILineUploadApi.kt @@ -10,7 +10,7 @@ import retrofit2.http.POST interface ILineUploadApi { @Headers("Content-type:application/json;charset=UTF-8" ) - @POST( "/yycp-data-center-service/carTrack/receiveCarTrack/" ) + @POST( "eagle-eye-dns/yycp-data-center-service/carTrack/receiveCarTrack/" ) fun uploadLineId(@Body lineId: LineUploadData): Observable } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt index 790ca44ab0..27780b4702 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/road/LineUploadManager.kt @@ -3,6 +3,7 @@ package com.mogo.eagle.function.biz.v2x.road import android.content.Context import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.constants.HostConst.DATA_CENTER_HOST +import com.mogo.commons.constants.HostConst.getEagleHost import com.mogo.eagle.core.data.v2x.LineUploadData import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager @@ -54,7 +55,7 @@ class LineUploadManager private constructor(context: Context) : IMoGoAutopilotSt private fun uploadLine(lineId: Long) { val lineUploadData = LineUploadData(lineId, MoGoAiCloudClientConfig.getInstance().sn) - disposable = MoGoRetrofitFactory.getInstance(DATA_CENTER_HOST) + disposable = MoGoRetrofitFactory.getInstance(getEagleHost()) .create(ILineUploadApi::class.java) .uploadLineId(lineUploadData) .subscribeOn(Schedulers.io()) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt index 8ad4ad3521..bde91cf45c 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/AiCloudIdentifyNetWorkModel.kt @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.business.ai.net import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.constants.HostConst import com.mogo.commons.debug.DebugConfig import com.mogo.eagle.core.data.BaseResponse import com.mogo.eagle.core.function.business.ai.AiCloudIdentifyDataManager.Companion.END_METRE @@ -27,7 +28,7 @@ class AiCloudIdentifyNetWorkModel { return host } - private fun getNetWorkApi(baseUrl: String = getHost()): IAiCloudIdentifyApiService { + private fun getNetWorkApi(baseUrl: String = HostConst.getEagleHost()): IAiCloudIdentifyApiService { return MoGoRetrofitFactory.getInstanceNoCallAdapter(baseUrl) .create(IAiCloudIdentifyApiService::class.java) } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt index 3ddaac5e43..2e8ec4357f 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/net/IAiCloudIdentifyApiService.kt @@ -8,6 +8,6 @@ import retrofit2.http.POST interface IAiCloudIdentifyApiService { @Headers("Content-type:application/json;charset=UTF-8") - @POST("yycp-c-v2x-service/dataFusion/remoteDrivingSet") + @POST("eagle-eye-dns/yycp-c-v2x-service/dataFusion/remoteDrivingSet") suspend fun identifyRange(@Body map: MutableMap): BaseResponse } \ No newline at end of file From d1cd2a0c3f5bfa449fd8cd0fb25d509627e9c16e Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 7 Mar 2023 19:03:23 +0800 Subject: [PATCH 04/23] [2.13.0-arch-opt] Volatile --- .../passenger/model/TaxiPassengerModel.java | 7 ++- .../autopilot/adapter/MoGoAdasListenerImpl.kt | 3 -- .../datacenter/v2x/TrafficLightDispatcher.kt | 2 + .../report/IPCReportManager.kt | 45 ++++++++++--------- .../hmi/ui/setting/DebugSettingView.kt | 1 + .../function/hmi/ui/widget/SpeedPanelView.kt | 1 + .../business/SpeedLimitDataManager.java | 2 +- 7 files changed, 32 insertions(+), 29 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java index bfef8a0271..daaf6b231c 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java @@ -117,8 +117,8 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback private IOCHTaxiPassengerADASStatusCallback mADASStatusCallback; //Model->Presenter：自动驾驶状态相关 private IOCHTaxiPassengerAutopilotPlanningCallback mAutopilotPlanningCallback; //Model->Presenter：自动驾驶线路规划 - private Map mOrderStatusCallbackMap = new ConcurrentHashMap<>(); - private Map mControllerStatusCallbackMap = new ConcurrentHashMap<>(); + private final Map mOrderStatusCallbackMap = new ConcurrentHashMap<>(); + private final Map mControllerStatusCallbackMap = new ConcurrentHashMap<>(); private ITaxiPassengerVeloctityCallback mVeloctityCallback;//道路限速返回 @@ -130,7 +130,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback private double mLongitude, mLatitude; private MogoLocation mLocation = null; - private List mLocationsModels = new ArrayList<>(); + private final List mLocationsModels = new ArrayList<>(); private TaxiPassengerModel() { } @@ -517,7 +517,6 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback @Override public void onAutopilotStatusResponse(@NotNull AutopilotStatusInfo autopilotStatusInfo) { - if (autopilotStatusInfo == null) return; int state = autopilotStatusInfo.getState(); // CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "state = %s", state ); if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index dfcd3dd961..85b14a2962 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -134,8 +134,6 @@ class MoGoAdasListenerImpl : OnAdasListener { if (gnssInfo != null) { if (1 == FunctionBuildConfig.gpsProvider) { - // 同步给MAP地图 - //CallerMapUIServiceManager.getMapUIController()?.syncLocation2Map(gnssInfo) // 同步更新经纬度和系统时间至 AutoPilotStatusListener CallerAutoPilotStatusListenerManager.updateAutoPilotLatLon( gnssInfo.satelliteTime, @@ -146,7 +144,6 @@ class MoGoAdasListenerImpl : OnAdasListener { } } - /** * 老底盘信息,透传底盘状态，pb参考底盘 * TODO 目前由于M1车型不会在新底盘PB添加新的字段 所以临时保留 diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt index 521aa5c3a4..4112baf491 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt @@ -50,9 +50,11 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight private var mContext: Context? = null //是否有AI获取红绿灯灯态 + @Volatile private var hasAiLightStatus: Boolean = false //obu数据 + @Volatile private var hasObuLightStatus: Boolean = false fun initServer(context: Context) { diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt index d9a7997639..d338f02da8 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/report/IPCReportManager.kt @@ -10,6 +10,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils +import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.eagle.core.utilcode.util.TimeUtils import mogo_msg.MogoReportMsg @@ -69,29 +70,30 @@ class IPCReportManager : IMoGoAutopilotStatusListener { *工控机监控节点上报 */ override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) { - guardianInfo?.let{ - if(it.resultList.contains(RESULT_AUTOPILOT_DISABLE) - || it.resultList.contains(RESULT_AUTOPILOT_SYSTEM_UNSTARTED) - || it.resultList.contains(RESULT_REMOTEPILOT_DISABLE) - || it.resultList.contains(RESULT_AUTOPILOT_INFERIOR) - || it.resultList.contains(RESULT_SHOW_WARNING) - || it.resultList.contains(RESULT_REMOTEPILOT_INFERIOR)){ - val reportEntity = ReportEntity(TimeUtils.millis2String(System.currentTimeMillis()), - it.src,it.level,it.msg,it.code,it.resultList,it.actionsList) - CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.REPORT, reportEntity)) - } + ThreadUtils.runOnUiThread { + guardianInfo?.let{ + if(it.resultList.contains(RESULT_AUTOPILOT_DISABLE) + || it.resultList.contains(RESULT_AUTOPILOT_SYSTEM_UNSTARTED) + || it.resultList.contains(RESULT_REMOTEPILOT_DISABLE) + || it.resultList.contains(RESULT_AUTOPILOT_INFERIOR) + || it.resultList.contains(RESULT_SHOW_WARNING) + || it.resultList.contains(RESULT_REMOTEPILOT_INFERIOR)){ + val reportEntity = ReportEntity(TimeUtils.millis2String(System.currentTimeMillis()), + it.src,it.level,it.msg,it.code,it.resultList,it.actionsList) + CallerMsgBoxManager.saveMsgBox(MsgBoxBean(MsgBoxType.REPORT, reportEntity)) + } - if (reportList.size > 49) { - reportList.removeLast() - } - reportList.add( - 0, - ReportEntity( - TimeUtils.millis2String(System.currentTimeMillis()), - it.src, it.level, it.msg, it.code, it.resultList, it.actionsList + if (reportList.size > 49) { + reportList.removeLast() + } + reportList.add( + 0, + ReportEntity( + TimeUtils.millis2String(System.currentTimeMillis()), + it.src, it.level, it.msg, it.code, it.resultList, it.actionsList + ) ) - ) - reportListFloatWindow?.refreshData(reportList) + reportListFloatWindow?.refreshData(reportList) // //Error 弹窗并有提示音 // if(it.resultList.contains(RESULT_AUTOPILOT_DISABLE) @@ -128,6 +130,7 @@ class IPCReportManager : IMoGoAutopilotStatusListener { // } // } // } + } } } 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 d855300e60..fac708c747 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 @@ -117,6 +117,7 @@ internal class DebugSettingView @JvmOverloads constructor( private var logInfoView: LogInfoView? = null private var logViewAttach = false + @Volatile private var mAutoPilotStatusInfo: AutopilotStatusInfo? = null private var mGnssInfo: MogoLocation? = null diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt index b7f531c972..325c33de50 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt @@ -27,6 +27,7 @@ class SpeedPanelView @JvmOverloads constructor( var mContext: Context var mSpeedChartView: SpeedChartView + @Volatile var mLatLng: MogoLocation? = null init { diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/SpeedLimitDataManager.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/SpeedLimitDataManager.java index 60c7d0eba3..7d77a80af3 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/SpeedLimitDataManager.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/SpeedLimitDataManager.java @@ -23,7 +23,7 @@ public class SpeedLimitDataManager implements IMoGoChassisLocationGCJ02Listener private final static String TAG = "SpeedLimitDataManager"; private static volatile SpeedLimitDataManager instance; - private MogoLocation mLocation; + private volatile MogoLocation mLocation; private SpeedLimitDataManager() { } From a6d82645f5f09f6bc674b23a455f14fe47cab714 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Tue, 7 Mar 2023 19:07:37 +0800 Subject: [PATCH 05/23] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E4=B8=8B=E8=BD=BD=E9=80=9A=E7=9F=A5=E6=A0=8F=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E8=B0=83=E8=AF=95=E9=9D=A2=E6=9D=BF=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=BD=A6=E4=BF=A1=E6=81=AF=E6=95=B0=E6=8D=AE=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../binding/BindingCarNetWorkManager.kt | 8 +++++++ .../upgrade/UpgradeManager.kt | 15 +----------- .../hmi/ui/setting/DebugSettingView.kt | 6 ++++- .../main/res/layout/view_debug_setting.xml | 23 +++++++++++++++++++ 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt index 9191619b4e..008fe69093 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt @@ -86,10 +86,18 @@ class BindingCarNetWorkManager private constructor() { SharedPrefsConstants.CAR_INFO, GsonUtils.toJson(info.getData()) ) + } else { + SharedPrefsMgr.getInstance(context).putString( + SharedPrefsConstants.CAR_INFO, "null") + e( + SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null " + ) } } override fun onError(e: Throwable) { + SharedPrefsMgr.getInstance(context).putString( + SharedPrefsConstants.CAR_INFO, e.message.toString()) e( SceneConstant.M_BINDING + TAG, "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt index e0acfc917a..c36e6f8542 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/UpgradeManager.kt @@ -1,8 +1,6 @@ package com.zhjt.mogo_core_function_devatools.upgrade -import android.app.NotificationManager import android.content.Context -import androidx.core.app.NotificationCompat import com.elegant.utils.UiThreadHandler import com.mogo.eagle.core.data.obu.MogoObuConst import com.mogo.eagle.core.function.api.devatools.IMogoDevaToolsUpgradeListener @@ -128,31 +126,20 @@ class UpgradeManager : IDownload { } /** - * 鹰眼app下载监听 liyz + * 鹰眼app下载监听 */ fun updateUpgradeProgress(context: Context) { - val builder = NotificationCompat.Builder(context) - // builder.setSmallIcon(R.mipmap.icon1001);//todo emArrow 更换图标，去除地图下载图标的依赖关系 - builder.setContentTitle("下载") - builder.setContentText("正在下载") - val manager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager CallerDevaToolsUpgradeListenerManager.addListener( TAG, object : IMogoDevaToolsUpgradeListener { override fun onStart(url: String?) {} override fun onPause(url: String?) {} override fun onProgress(url: String?, length: Int) { - builder.setProgress(100, length, false) - manager.notify(0x3, builder.build()) - //下载进度提示 - builder.setContentText("已下载$length%") updateStatusBarDownloadView(true, "download", length) } override fun onFinished(url: String?) { - builder.setContentText("已下载" + 100 + "%") UiThreadHandler.postDelayed({ - manager.cancel(0x3) updateStatusBarDownloadView(false, "download", 100) }, 1000) } 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 d855300e60..06d45f81f2 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 @@ -21,6 +21,7 @@ import chassis.Chassis import chassis.ChassisStatesOuterClass import com.mogo.cloud.passport.MoGoAiCloudClient import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.constants.SharedPrefsConstants import com.mogo.commons.debug.DebugConfig import com.mogo.commons.module.status.MogoStatusManager import com.mogo.eagle.core.data.app.AppConfigInfo @@ -206,7 +207,6 @@ internal class DebugSettingView @JvmOverloads constructor( CallerChassisGearStateListenerManager.addListener(TAG, this) CallerChassisSteeringStateListenerManager.addListener(TAG, this) CallerChassisThrottleStateListenerManager.addListener(TAG, this) - //添加 开发套件工具接口 监听 CallerDevaToolsListenerManager.addListener(TAG, this) //添加 底盘灯光数据 监听 @@ -257,6 +257,7 @@ internal class DebugSettingView @JvmOverloads constructor( CallerChassisLamplightListenerManager.removeListener(TAG) // 移除 obu获取信息 监听 CallerObuInfoListenerManager.removeListener(TAG) + // 移除 业务配置监听 CallerDevaToolsFuncConfigListenerManager.unRegisterDevaToolsFuncConfigListener( FuncBizConfig.FOUNDATION, @@ -359,6 +360,7 @@ internal class DebugSettingView @JvmOverloads constructor( swDevelopMode.visibility = View.GONE } } + /** * 开发者模式 */ @@ -1589,6 +1591,7 @@ internal class DebugSettingView @JvmOverloads constructor( tvAutopilotInfo.text = autopilotJson tvIpcInfo.text = autopilotJson tvIpcInfoKey.text = autopilotJson + tvCmdbCarInfoContent.text = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.CAR_INFO) tvCarInfo.text = "GPS时间：${(mGnssInfo?.satelliteTime?.times(1000))?.toLong()}\n" + @@ -2046,4 +2049,5 @@ internal class DebugSettingView @JvmOverloads constructor( override fun onObuDeviceId(obuDeviceId: String) { mObuDeviceId = obuDeviceId } + } \ No newline at end of file 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 c38a1baeb9..eb5078690b 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 @@ -206,6 +206,29 @@ android:layout_height="1dp" android:background="#F0F0F0" /> + + + + + + + Date: Tue, 7 Mar 2023 20:30:15 +0800 Subject: [PATCH 06/23] =?UTF-8?q?[Opt3.0]=E4=BC=98=E5=8C=96=E8=87=AA?= =?UTF-8?q?=E8=BD=A6=E6=98=AF=E5=90=A6=E8=B5=B0=E8=BF=87=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=E7=82=B9=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/smp/MarkerDrawerManager.kt | 29 ++++++++++++------- .../eagle/core/function/view/OverMapView.kt | 8 +++-- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt index f78a2c274e..1c916ecbf7 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/MarkerDrawerManager.kt @@ -1,10 +1,10 @@ package com.mogo.eagle.core.function.smp import android.content.Context -import android.util.Log import com.amap.api.maps.CoordinateConverter import com.amap.api.maps.model.LatLng import com.mogo.eagle.core.utilcode.util.CoordinateUtils +import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils import io.reactivex.Observable import io.reactivex.ObservableOnSubscribe import io.reactivex.android.schedulers.AndroidSchedulers @@ -35,7 +35,7 @@ object MarkerDrawerManager { var lastArrivedIndex: Int = -1 @Volatile - var lonLat = Pair(0.0, 0.0) + var lonLatHeading = Triple(0.0, 0.0, 0.0) var callback: Callback? = null @@ -59,16 +59,17 @@ object MarkerDrawerManager { private fun getLoopCalCarObservable(): Observable { return Observable.create(ObservableOnSubscribe { emitter -> if (emitter.isDisposed) return@ObservableOnSubscribe - loopRouteAndWipe(planningPoints, lonLat.first, lonLat.second) + loopRouteAndWipe(planningPoints, lonLatHeading.first, lonLatHeading.second, lonLatHeading.third) emitter.onComplete() }) } - private fun loopRouteAndWipe(routePoints: List?, lon: Double, lat: Double) { + private fun loopRouteAndWipe(routePoints: List?, lon: Double, lat: Double, heading: Double) { if (routePoints != null && routePoints.isNotEmpty()) { - val arrivedIndex: Int = getArrivedPointIndex(routePoints, lon, lat) + val newPointList = ArrayList() + val arrivedIndex: Int = getArrivedPointIndex(routePoints, newPointList, lon, lat, heading) if (arrivedIndex != -1 && lastArrivedIndex != arrivedIndex) { - callback?.onLocationChanged(routePoints, arrivedIndex) + callback?.onLocationChanged(newPointList, arrivedIndex) lastArrivedIndex = arrivedIndex } } @@ -90,8 +91,10 @@ object MarkerDrawerManager { */ private fun getArrivedPointIndex( routePoints: List, + newPoints: MutableList, realLon: Double, - realLat: Double + realLat: Double, + heading: Double ): Int { var currentIndex = 0 //记录疑似点 if (routePoints.isNotEmpty()) { @@ -100,6 +103,7 @@ object MarkerDrawerManager { var baseDiffDis = CoordinateUtils.calculateLineDistance( realLon, realLat, baseLatLng.longitude, baseLatLng.latitude ) // lon,lat, prelon, prelat +// val lastIndex = if (lastArrivedIndex >= 1 && lastArrivedIndex <= routePoints.size - 1) lastArrivedIndex else 1 for (i in 1 until routePoints.size) { val latLng = routePoints[i] val diff = CoordinateUtils.calculateLineDistance( @@ -107,12 +111,17 @@ object MarkerDrawerManager { ) if (baseDiffDis > diff) { baseDiffDis = diff - currentIndex = i + // 距离最近的时候判断是否走过 + if (DrivingDirectionUtils.getDegreeOfCar2Poi2(realLon, realLat, latLng.longitude, latLng.latitude, heading) >= 90) { + currentIndex = i + } } } - return currentIndex + newPoints.addAll(routePoints) + newPoints.add(currentIndex + 1, LatLng(realLat, realLon)) + return currentIndex + 1 } - return currentIndex + return 0 } /** diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt index f7d42bc526..dd56a3045b 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt @@ -36,7 +36,7 @@ import com.mogo.eagle.core.function.smp.MakerWithCount import com.mogo.eagle.core.function.smp.MarkerDrawerManager import com.mogo.eagle.core.function.smp.MarkerDrawerManager.callback import com.mogo.eagle.core.function.smp.MarkerDrawerManager.coordinateConverterWgsToGcj -import com.mogo.eagle.core.function.smp.MarkerDrawerManager.lonLat +import com.mogo.eagle.core.function.smp.MarkerDrawerManager.lonLatHeading import com.mogo.eagle.core.function.smp.MarkerDrawerManager.planningPoints import com.mogo.eagle.core.function.smp.MarkerDrawerManager.startLoopCalCarLocation import com.mogo.eagle.core.function.smp.MarkerDrawerManager.updateRoutePoints @@ -636,6 +636,8 @@ class OverMapView @JvmOverloads constructor( texIndexList.clear() } for (i in coordinates.indices) { + // 线段数比点数少一个 + if (i == 0) continue if (i <= locIndex) { if (isClearArrived) { textureList.add(transparentBitmap) @@ -647,7 +649,7 @@ class OverMapView @JvmOverloads constructor( // 未走过的纹理 textureList.add(unArrivedBitmap) } - texIndexList.add(i) + texIndexList.add(i - 1) } if (mAMap != null && coordinates.size > 2) { //设置线段纹理 @@ -670,7 +672,7 @@ class OverMapView @JvmOverloads constructor( override fun onChassisLocationGCJ02(gnssInfo: MogoLocation?) { gnssInfo?.let { mLocation = it - lonLat = Pair(it.longitude, it.latitude) + lonLatHeading = Triple(it.longitude, it.latitude, it.heading) drawCarMarker(it) if (isFirstLocation) { displayCustomOverView() From bc3b3f1a4821dd5d2f863277192e2ead52623e4e Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 8 Mar 2023 09:59:24 +0800 Subject: [PATCH 07/23] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96cmdb=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../binding/BindingCarNetWorkManager.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt index 008fe69093..a6b0fccc0f 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt @@ -87,8 +87,8 @@ class BindingCarNetWorkManager private constructor() { GsonUtils.toJson(info.getData()) ) } else { - SharedPrefsMgr.getInstance(context).putString( - SharedPrefsConstants.CAR_INFO, "null") +// SharedPrefsMgr.getInstance(context).putString( +// SharedPrefsConstants.CAR_INFO, "null") e( SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null " ) @@ -96,8 +96,8 @@ class BindingCarNetWorkManager private constructor() { } override fun onError(e: Throwable) { - SharedPrefsMgr.getInstance(context).putString( - SharedPrefsConstants.CAR_INFO, e.message.toString()) +// SharedPrefsMgr.getInstance(context).putString( +// SharedPrefsConstants.CAR_INFO, e.message.toString()) e( SceneConstant.M_BINDING + TAG, "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message From 2005201d04bd05dd9abe53d63cc7ccb2d7213f4f Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Wed, 8 Mar 2023 16:40:26 +0800 Subject: [PATCH 08/23] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=AD=94=E6=96=B9toast=E6=8E=A7=E5=88=B6=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9HDMAP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../obu/MogoPrivateObuNewManager.kt | 1 + .../mofang/MoFangManager.kt | 52 +++++++++---------- .../hmi/ui/setting/DebugSettingView.kt | 19 ++++--- .../main/res/layout/view_debug_setting.xml | 21 ++++---- .../eagle/core/data/config/HmiBuildConfig.kt | 4 +- .../eagle/core/data/enums/DataSourceType.kt | 4 +- 6 files changed, 54 insertions(+), 47 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt index 3f7f908681..97b4eb3975 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt @@ -407,6 +407,7 @@ class MogoPrivateObuNewManager private constructor() : OnUpgradeListener { alertContent = EventTypeEnumNew.getWarningContent(appId) ttsContent = EventTypeEnumNew.getWarningTts(appId) + alertContent = String.format( //标牌是没有影响范围的 alertContent, Math.round(data.warningMsgList[0].distance).toString() diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kt index 27ffcea085..28ab73c903 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangManager.kt @@ -9,6 +9,7 @@ import android.content.Intent import android.content.IntentFilter import android.view.KeyEvent import com.mogo.commons.context.ContextHolderUtil +import com.mogo.eagle.core.data.config.HmiBuildConfig import com.mogo.eagle.core.data.deva.mofang.MfConstants import com.mogo.eagle.core.function.api.devatools.mofang.IMoGoMoFangListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.sendOperatorChangeLaneLeft @@ -46,7 +47,6 @@ class MoFangManager private constructor() : IMoGoMoFangListener { private lateinit var mBluetoothAdapter: BluetoothAdapter private var isMfConnect: Boolean = false //添加状态判断 - private val isShowToast = false //toast 控制,自测使用 private var startPressTime: Long = 0 //开始按键时间 private var isPressEnd = false //按键是否结束 @Volatile @@ -171,23 +171,23 @@ class MoFangManager private constructor() : IMoGoMoFangListener { startPressTime = System.currentTimeMillis() } e(M_F + "MoFangManager", - "dispatchKeyEvent ------ bluetoothName = $bluetoothName ---code = $keyCode -----action = $action ") + "dispatchKeyEvent ------ bluetoothName = $bluetoothName ---code = $keyCode -----action = $action ---HmiBuildConfig.isShowMfToastView = ${HmiBuildConfig.isShowMfToastView}") if (keyCode == KeyEvent.KEYCODE_A) { //单击 -1，长按无操作，AB组合-2 if (action == KeyEvent.ACTION_DOWN) { pressADownTime = System.currentTimeMillis() d(M_F + "MoFangManager", "dispatchKeyEvent A down pressADownTime = " + pressADownTime + "---" + (pressADownTime - startPressTime) + "----isCombinationKey = " + isCombinationKey + "--pressBDownTime = " + pressBDownTime) if (pressADownTime - startPressTime in (clickTimeInterval + 1) until longPressTime && pressBDownTime > 0) { - if (isShowToast) { - ToastUtils.showShort("方块 A 按AB组合 +1 ") + if (HmiBuildConfig.isShowMfToastView) { + ToastUtils.showShort("方块 A 按AB组合 +1 timeInterval: ${pressADownTime - startPressTime}ms---$pressBDownTime") } sendAcc(true, +1.0) isCombinationKey = 3 } if (isCombinationKey != 3 && isCombinationKey != 1) { if (pressADownTime - startPressTime > longPressTimeInterval) { - if (isShowToast) { - ToastUtils.showShort("方块 长按A -2 ") + if (HmiBuildConfig.isShowMfToastView) { + ToastUtils.showShort("方块 长按A -2 timeInterval: ${pressADownTime - startPressTime}ms") } sendAcc(true, -2.0) isCombinationKey = 2 @@ -199,8 +199,8 @@ class MoFangManager private constructor() : IMoGoMoFangListener { "dispatchKeyEvent A up pressAUpTime = " + pressAUpTime + "---" + (pressAUpTime - startPressTime) + "--pressBDownTime = " + pressBDownTime + "---isCombinationKey = $isCombinationKey") if (pressAUpTime - startPressTime < clickTime && isCombinationKey != 3) { isCombinationKey = 1 - if (isShowToast) { - ToastUtils.showShort("方块 单击A -1 ") + if (HmiBuildConfig.isShowMfToastView) { + ToastUtils.showShort("方块 单击A -1 timeInterval: ${pressAUpTime - startPressTime}ms") } sendAcc(true, -1.0) } @@ -215,16 +215,16 @@ class MoFangManager private constructor() : IMoGoMoFangListener { "dispatchKeyEvent B down pressBDownTime = " + pressBDownTime + "--差-" + (pressBDownTime - startPressTime) + "---isCombinationKey = " + isCombinationKey + "--pressADownTime = " + pressADownTime ) if (pressBDownTime - startPressTime > clickTimeInterval && pressBDownTime - startPressTime < longPressTime && pressADownTime > 0) { - if (isShowToast) { - ToastUtils.showShort("方块 B 按AB组合 +1 ") + if (HmiBuildConfig.isShowMfToastView) { + ToastUtils.showShort("方块 B 按AB组合 +1 timeInterval: ${pressBDownTime - startPressTime}ms ---pressADownTime = $pressADownTime ") } sendAcc(true, +1.0) isCombinationKey = 3 } if (isCombinationKey != 3 && isCombinationKey != 1) { if (pressBDownTime - startPressTime > longPressTimeInterval) { - if (isShowToast) { - ToastUtils.showShort("方块 长按B 无操作 ") + if (HmiBuildConfig.isShowMfToastView) { + ToastUtils.showShort("方块 长按B 无操作 timeInterval: ${pressBDownTime - startPressTime}ms") } isCombinationKey = 2 } @@ -234,8 +234,8 @@ class MoFangManager private constructor() : IMoGoMoFangListener { d(M_F + "MoFangManager", "dispatchKeyEvent B up pressBUpTime = " + pressBUpTime + "--差-" + (pressBUpTime - startPressTime) + "--pressADownTime = " + pressADownTime + "----isCombinationKey = $isCombinationKey") if (pressBUpTime - startPressTime < clickTime && isCombinationKey != 3) { - if (isShowToast) { - ToastUtils.showShort("方块 单击B 0 ") + if (HmiBuildConfig.isShowMfToastView) { + ToastUtils.showShort("方块 单击B 0 timeInterval: ${pressBUpTime - startPressTime}ms") } sendAcc(false, 0.0) isCombinationKey = 1 @@ -250,8 +250,8 @@ class MoFangManager private constructor() : IMoGoMoFangListener { d(M_F + "MoFangManager", "dispatchKeyEvent 方块 长按C 无操作 time dif = " + (pressCDownTime - startPressTime)) if (pressCDownTime - startPressTime > longPressTimeInterval) { - if (isShowToast) { - ToastUtils.showShort("方块 长按C 无操作 ") + if (HmiBuildConfig.isShowMfToastView) { + ToastUtils.showShort("方块 长按C 无操作 timeInterval: ${pressCDownTime - startPressTime}ms") } } } else if (action == KeyEvent.ACTION_UP) { @@ -260,8 +260,8 @@ class MoFangManager private constructor() : IMoGoMoFangListener { d(M_F + "MoFangManager", "dispatchKeyEvent 方块 单击C ← 向左变道 time dif = " + (pressCUpTime - startPressTime)) if (pressCUpTime - startPressTime < clickTime) { - if (isShowToast) { - ToastUtils.showShort("方块 单击C ← 向左变道 ") + if (HmiBuildConfig.isShowMfToastView) { + ToastUtils.showShort("方块 单击C ← 向左变道 timeInterval: ${pressCUpTime - startPressTime}ms") } sendOperatorChangeLaneLeft() } @@ -272,8 +272,8 @@ class MoFangManager private constructor() : IMoGoMoFangListener { d(M_F + "MoFangManager", "dispatchKeyEvent 方块 长按D 无操作 time dif = " + (pressDDownTime - startPressTime)) if (pressDDownTime - startPressTime > longPressTimeInterval) { - if (isShowToast) { - ToastUtils.showShort("方块 长按D 无操作 ") + if (HmiBuildConfig.isShowMfToastView) { + ToastUtils.showShort("方块 长按D 无操作 timeInterval: ${pressDDownTime - startPressTime}ms") } } } else if (action == KeyEvent.ACTION_UP) { @@ -282,8 +282,8 @@ class MoFangManager private constructor() : IMoGoMoFangListener { d(M_F + "MoFangManager", "dispatchKeyEvent 方块 单击D → 向右变道 time dif = " + (pressDUpTime - startPressTime)) if (pressDUpTime - startPressTime < clickTime) { - if (isShowToast) { - ToastUtils.showShort("方块 单击D → 向右变道 ") + if (HmiBuildConfig.isShowMfToastView) { + ToastUtils.showShort("方块 单击D → 向右变道 timeInterval: ${pressDUpTime - startPressTime}ms") } sendOperatorChangeLaneRight() } @@ -294,8 +294,8 @@ class MoFangManager private constructor() : IMoGoMoFangListener { d(M_F + "MoFangManager", "dispatchKeyEvent 方块 长按E 鸣笛 time dif = " + (pressEDownTime - startPressTime)) if (pressEDownTime - startPressTime > longPressTimeInterval) { - if (isShowToast) { - ToastUtils.showShort("方块 长按E 鸣笛 ") + if (HmiBuildConfig.isShowMfToastView) { + ToastUtils.showShort("方块 长按E 鸣笛 timeInterval: ${pressEDownTime - startPressTime}ms") } sendOperatorSetHorn(1.0) if (timerHorn == null) { @@ -314,8 +314,8 @@ class MoFangManager private constructor() : IMoGoMoFangListener { d(M_F + "MoFangManager", "方块 单击E 开启自动驾驶 time dif = " + (pressEUpTime - startPressTime)) if (pressEUpTime - startPressTime < clickTime) { - if (isShowToast) { - ToastUtils.showShort("方块 单击E 开启自动驾驶 ") + if (HmiBuildConfig.isShowMfToastView) { + ToastUtils.showShort("方块 单击E 开启自动驾驶 timeInterval: ${pressEUpTime - startPressTime}ms") } startAutoPilot(getAutoPilotStatusInfo().autopilotControlParameters) } 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 b00371609d..c08ac6fc9c 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 @@ -9,6 +9,7 @@ import android.graphics.Color import android.os.Build import android.text.Html import android.util.AttributeSet +import android.util.Log import android.view.LayoutInflater import android.view.View import androidx.annotation.RequiresApi @@ -77,6 +78,8 @@ import com.mogo.eagle.core.utilcode.util.* import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.map.uicontroller.VisualAngleMode.* import kotlinx.android.synthetic.main.view_debug_setting.view.* +import kotlinx.android.synthetic.main.view_debug_setting.view.tbRouteDynamicEffect +import kotlinx.android.synthetic.main.view_sop_setting.view.* import kotlinx.coroutines.launch import mogo.telematics.pad.MessagePad import mogo_msg.MogoReportMsg @@ -296,21 +299,23 @@ internal class DebugSettingView @JvmOverloads constructor( } } - /** - * 魔戒控制 - */ tbMojie.setOnCheckedChangeListener { buttonView, isChecked -> if (isChecked) { buttonView.setCompoundDrawables(null, null, iconDown, null) - btnOpenAllGestures.visibility = View.VISIBLE + tbOpenMfView.visibility = View.VISIBLE } else { buttonView.setCompoundDrawables(null, null, iconRight, null) - btnOpenAllGestures.visibility = View.GONE + tbOpenMfView.visibility = View.GONE } } - btnOpenAllGestures.setOnClickListener { - CallerMapUIServiceManager.getMapUIController()?.setAllGesturesEnabled(true) + /** + * 蘑方控制 默认关闭 + */ + tbOpenMfView.isChecked = HmiBuildConfig.isShowMfToastView + tbOpenMfView.setOnCheckedChangeListener { _, isChecked -> + Log.d("liyz", "isChecked = $isChecked") + HmiBuildConfig.isShowMfToastView = isChecked } /** 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 eb5078690b..27d514d3b1 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 @@ -309,21 +309,22 @@ android:background="@drawable/radio_button_normal_background_right" android:drawableEnd="@drawable/icon_right" android:padding="@dimen/dp_20" - android:textOff="魔戒控制" - android:textOn="魔戒控制" + android:textOff="蘑方控制" + android:textOn="蘑方控制" android:textSize="@dimen/dp_24" /> -