From 94c8e5e3120c7fe9cfa2f0d49f5fe999028055e6 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 16 Dec 2022 16:17:19 +0800 Subject: [PATCH] =?UTF-8?q?[2.13.0]=20=E6=B7=BB=E5=8A=A0OBU=E5=88=B0DC?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E6=8E=A7=E5=88=B6=EF=BC=8C=E6=9C=AA?= =?UTF-8?q?=E6=9D=A5=E9=9C=80=E8=A6=81=E4=BA=A7=E5=93=81=E5=AE=9A=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/setting/SOPSettingView.kt | 11 +++++++++-- .../src/main/res/layout/view_sop_setting.xml | 14 +++++++++++++- .../impl/marker/drawer/TrafficMarkerDrawer.kt | 3 --- .../mogo/eagle/core/data/config/HmiBuildConfig.kt | 7 +++++++ .../crashreport/apm/ApmCrashReportProvider.java | 2 +- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index fb7a6e2279..3038b11206 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -109,7 +109,6 @@ class SOPSettingView @JvmOverloads constructor( tbObuV2vView.setOnCheckedChangeListener { _, isChecked -> //默认关闭 HmiBuildConfig.isShowObuV2vView = isChecked - Log.d("liyz", "v2v isChecked = $isChecked") } /** @@ -118,7 +117,15 @@ class SOPSettingView @JvmOverloads constructor( tbObuV2iView.setOnCheckedChangeListener { _, isChecked -> //默认关闭 HmiBuildConfig.isShowObuV2iView = isChecked - Log.d("liyz", "viv isChecked = $isChecked") + } + + /** + * obu 数据通过dc 传输V2i事件 开关 TODO pm确定下开关功能 HmiBuildConfig.isShowObuToDcV2iView + */ + tbObuToDcView.setOnCheckedChangeListener { _, isChecked -> + //默认开启 + HmiBuildConfig.isShowObuToDcV2iView = !isChecked +// Log.d("liyz", "HmiBuildConfig.isShowObuToDcV2iView = " + HmiBuildConfig.isShowObuToDcV2iView) } //红绿灯标识 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 cabfc8015a..e9830e19b0 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 @@ -154,13 +154,25 @@ android:textSize="@dimen/dp_24" /> + + diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/TrafficMarkerDrawer.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/TrafficMarkerDrawer.kt index d997b4a417..3527a4a31f 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/TrafficMarkerDrawer.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/drawer/TrafficMarkerDrawer.kt @@ -168,9 +168,6 @@ object TrafficMarkerDrawer { TAG, "drawObuRecognizedDataMarker trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel ) -// Log.d("liyz", -// "drawObuRecognizedDataMarker trafficData.type = " + trafficData.type + "---trafficData.threatLevel = " + trafficData.threatLevel -// ) if (trafficData.type != null) { val resId: Int = trafficData.type.traffic3DIconId diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt index f51e678b8d..f156f8b981 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt @@ -114,5 +114,12 @@ object HmiBuildConfig { @Volatile var isShowObuV2iView = false + /** + * 是否展示obu通过工控机展示的v2i + */ + @JvmField + @Volatile + var isShowObuToDcV2iView = true + } \ No newline at end of file diff --git a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java index 3ccd681638..cf168eaea4 100644 --- a/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java +++ b/test/crashreport-apmbyte/src/main/java/com/mogo/test/crashreport/apm/ApmCrashReportProvider.java @@ -68,7 +68,7 @@ public class ApmCrashReportProvider implements ITestCrashReportProvider { mCityCode = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_CITY_CODE); mLat = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LATITUDE); mLogt = SharedPrefsMgr.getInstance(context).getString(SharedPrefsConstants.LOCATION_LONGITUDE); -// Log.d("liyz", "cityCode = " + mCityCode + " --lat = " +mLat + " --logt = " + mLogt); +// Log.d(TAG, "cityCode = " + mCityCode + " --lat = " +mLat + " --logt = " + mLogt); //地图版本 String mapSDKVersion = AppUtils.getCustomMapSDKVersion(context); map.put("MAP_SDK_VERSION", mapSDKVersion);