From d0334ff82c8a0c25f42e76d8ad6110ee6bc3abc5 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 23 Aug 2023 15:51:32 +0800 Subject: [PATCH 1/6] [6.0.0] change the color of fusion --- .../function/business/identify/TrackerSourceFilterHelper.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt index 7fbd402897..15de210698 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt @@ -50,7 +50,7 @@ object TrackerSourceFilterHelper { if(FunctionBuildConfig.isFusionColor){ if(isFusion(data)){ - color = "#71F7FFFF" + color = "#982FFFFF" } if(isV2X(data)){ color = "#F6F6F6FF" From 3edfd25892e21ff89fed94157a7b2bdba9f4c862 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 23 Aug 2023 15:53:44 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[6.0.0]=201=E3=80=81marker=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index cb5d39a442..ae99c9c22a 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -329,6 +329,8 @@ class TaxiCurrentTaskFragment : BaseFragment(), } } + updateMapMarkers() + updateRemainDistanceAndTime(false) } From c55dc57f928872ba708a6fc72c49e79393bd66a7 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 23 Aug 2023 15:53:35 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[6.0.0][=E9=AD=94=E6=96=B9]=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=9B=B8=E5=85=B3=E7=8A=B6=E6=80=81=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mofang/MoFangAnalyticUtils.kt | 6 ++++++ .../mofang/MoGoMoFangProviderImpl.kt | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangAnalyticUtils.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangAnalyticUtils.kt index 5e67e5f4e7..1214c246a3 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangAnalyticUtils.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangAnalyticUtils.kt @@ -15,6 +15,12 @@ internal class MoFangAnalyticUtils { const val EVENT_SUB_CONNECT_SUCCESS = "event_sub_connect_success" const val EVENT_SUB_START_DISCONNECT = "event_sub_start_disconnect" const val EVENT_SUB_DISCONNECT_SUCCESS = "event_sub_disconnect_success" + const val EVENT_SUB_DISCONNECT_SLEEP = "event_sub_disconnect_sleep" + const val EVENT_SUB_BLUETOOTH_SETTING_REQ = "event_sub_ble_set_req" + const val EVENT_SUB_BLUETOOTH_OPEN_DENY = "event_sub_ble_open_deny" + const val EVENT_SUB_BLUETOOTH_OPEN_AGREE = "event_sub_ble_open_agree" + const val EVENT_SUB_IS_VALID = "event_sub_is_ipt_valid" + const val EVENT_SUB_IS_INVALID = "event_sub_is_ipt_invalid" // 魔方电量 const val EVENT_BATTERY = "event_mofang_battery" diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt index 025212fbd2..fea3bc7849 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoGoMoFangProviderImpl.kt @@ -26,16 +26,20 @@ import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companio import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_INPUT_SUB_KEYCODE import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_INPUT_SUB_TYPE import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_MOFANG_CONNECT +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_BLUETOOTH_OPEN_AGREE +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_BLUETOOTH_OPEN_DENY +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_BLUETOOTH_SETTING_REQ import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_CONNECT_SUCCESS +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_DISCONNECT_SLEEP import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_DISCONNECT_SUCCESS +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_IS_INVALID +import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_IS_VALID import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_START_CONNECT import com.zhjt.mogo_core_function_devatools.mofang.MoFangAnalyticUtils.Companion.EVENT_SUB_START_DISCONNECT import kotlinx.coroutines.* import me.jessyan.autosize.utils.AutoSizeUtils import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicBoolean -import java.util.concurrent.atomic.AtomicInteger -import java.util.concurrent.atomic.AtomicReference internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListener { @@ -263,6 +267,7 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen override fun onBluetoothKeyboardInputInvalid() { Log.d(TAG, "--- onBluetoothKeyboardInputInvalid ---") + MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_IS_INVALID to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothKeyboardInputInvalid")) UiThreadHandler.post { listeners.values.forEach { @@ -273,21 +278,25 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen override fun onBluetoothKeyboardInputValid() { Log.d(TAG, "--- onBluetoothKeyboardInputValid ---") + MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_IS_VALID to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothKeyboardInputValid")) } override fun onBluetoothOpenAgreed() { Log.d(TAG, "--- onBluetoothOpenAgreed ---") + MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_BLUETOOTH_OPEN_AGREE to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothOpenAgreed")) } override fun onBluetoothOpenDenied() { Log.d(TAG, "--- onBluetoothOpenDenied ---") + MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_BLUETOOTH_OPEN_DENY to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothOpenDenied")) } override fun onBluetoothSettingRequest() { Log.d(TAG, "--- onBluetoothSettingRequest ---") + MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_BLUETOOTH_SETTING_REQ to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothSettingRequest")) UiThreadHandler.post { Toast.makeText(Utils.getApp(), "检测到魔方未正确连接，请在系统蓝牙设置页面，找到魔方并配对连接...", Toast.LENGTH_SHORT).show() @@ -296,6 +305,7 @@ internal class MoGoMoFangProviderImpl: IMoGoMoFangProvider, OnMoFangDeviceListen override fun onBluetoothKeyboardAbnormalDisconnected(status: Int) { Log.d(TAG, "--- onBluetoothKeyboardAbnormalDisconnected(status: $status) ---") + MoFangAnalyticUtils.track(EVENT_MOFANG_CONNECT, mutableMapOf(EVENT_SUB_DISCONNECT_SLEEP to "${System.currentTimeMillis()}")) linkedLog.record(mapOf("callback" to "onBluetoothKeyboardAbnormalDisconnected:$status")) } } \ No newline at end of file From c5b087afc3d34f35c43350408ea0bf555e43238c Mon Sep 17 00:00:00 2001 From: pangfan Date: Wed, 23 Aug 2023 16:06:32 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[6.0.0/5.0.0]MessagePad.Line=E6=96=B0?= =?UTF-8?q?=E5=A2=9ElineName=E5=AD=97=E6=AE=B5:=E5=A2=9E=E5=8A=A0debug=20v?= =?UTF-8?q?iew=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/bus/fragment/BaseBusTabFragment.java | 4 ++++ OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml | 7 +++++++ .../java/com/mogo/och/bus/fragment/BaseBusTabFragment.java | 4 ++++ .../src/main/res/layout/bus_test_bar_view.xml | 7 +++++++ .../src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java | 4 ++++ OCH/taxi/driver/src/main/res/layout/taxi_panel.xml | 7 +++++++ .../main/java/com/mogo/och/taxi/ui/debug/OrderDebugView.kt | 5 ++++- .../src/main/res/layout/taxi_debug_order.xml | 7 +++++++ 8 files changed, 44 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index 24743f06cd..665402c4df 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -586,6 +586,7 @@ public abstract class BaseBusTabFragment */ private View busTestBar; private TextView lineIdTV; + private TextView lineNameTV; private TextView trajMd5TV; private TextView stopMd5TV; private TextView trajMd5DPQPTV; @@ -595,6 +596,7 @@ public abstract class BaseBusTabFragment if (busTestBar == null) { busTestBar = findViewById(R.id.module_mogo_och_bus_test_bar); lineIdTV = findViewById(R.id.bus_test_bar_current_line_id); + lineNameTV = findViewById(R.id.bus_test_bar_current_line_name); trajMd5TV = findViewById(R.id.bus_test_bar_current_traj_md5); stopMd5TV = findViewById(R.id.bus_test_bar_current_stop_md5); trajMd5DPQPTV = findViewById(R.id.bus_test_bar_current_traj_md5_dpqp); @@ -606,6 +608,7 @@ public abstract class BaseBusTabFragment } else { BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult(); lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId()))); + lineNameTV.setText("lineName:" + (routesResult == null ? "" : routesResult.getName())); trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5)); stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5)); trajMd5DPQPTV.setText("TMd5DPQP:" + (routesResult == null ? "" : routesResult.csvFileMd5DPQP)); @@ -618,6 +621,7 @@ public abstract class BaseBusTabFragment if (busTestBar != null && busTestBar.getVisibility() == View.VISIBLE) { BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult(); lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId()))); + lineNameTV.setText("lineName:" + (routesResult == null ? "" : routesResult.getName())); trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5)); stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5)); trajMd5DPQPTV.setText("TMd5DPQP:" + (routesResult == null ? "" : routesResult.csvFileMd5DPQP)); diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml index d3e7bffd9e..a64bdaa4d9 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml +++ b/OCH/mogo-och-bus/src/main/res/layout/bus_test_bar_view.xml @@ -11,6 +11,13 @@ android:textSize="@dimen/dp_24" android:textColor="@android:color/white"/> + + */ private View busTestBar; private TextView lineIdTV; + private TextView lineNameTV; private TextView trajMd5TV; private TextView stopMd5TV; private TextView trajMd5DPQPTV; @@ -602,6 +603,7 @@ public abstract class BaseBusTabFragment if (busTestBar == null) { busTestBar = findViewById(R.id.module_mogo_och_bus_test_bar); lineIdTV = findViewById(R.id.bus_test_bar_current_line_id); + lineNameTV = findViewById(R.id.bus_test_bar_current_line_name); trajMd5TV = findViewById(R.id.bus_test_bar_current_traj_md5); stopMd5TV = findViewById(R.id.bus_test_bar_current_stop_md5); trajMd5DPQPTV = findViewById(R.id.bus_test_bar_current_traj_md5_dpqp); @@ -613,6 +615,7 @@ public abstract class BaseBusTabFragment } else { BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult(); lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId()))); + lineNameTV.setText("lineName:" + (routesResult == null ? "" : routesResult.getName())); trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5)); stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5)); trajMd5DPQPTV.setText("TMd5DPQP:" + (routesResult == null ? "" : routesResult.csvFileMd5DPQP)); @@ -625,6 +628,7 @@ public abstract class BaseBusTabFragment if (busTestBar != null && busTestBar.getVisibility() == View.VISIBLE) { BusRoutesResult routesResult = OrderModel.getInstance().getBusRoutesResult(); lineIdTV.setText("lineId:" + (routesResult == null ? "" : String.valueOf(routesResult.getLineId()))); + lineNameTV.setText("lineName:" + (routesResult == null ? "" : routesResult.getName())); trajMd5TV.setText("TMd5:" + (routesResult == null ? "" : routesResult.csvFileMd5)); stopMd5TV.setText("SMd5:" + (routesResult == null ? "" : routesResult.txtFileMd5)); trajMd5DPQPTV.setText("TMd5DPQP:" + (routesResult == null ? "" : routesResult.csvFileMd5DPQP)); diff --git a/OCH/mogo-och-shuttle/src/main/res/layout/bus_test_bar_view.xml b/OCH/mogo-och-shuttle/src/main/res/layout/bus_test_bar_view.xml index d3e7bffd9e..a64bdaa4d9 100644 --- a/OCH/mogo-och-shuttle/src/main/res/layout/bus_test_bar_view.xml +++ b/OCH/mogo-och-shuttle/src/main/res/layout/bus_test_bar_view.xml @@ -11,6 +11,13 @@ android:textSize="@dimen/dp_24" android:textColor="@android:color/white"/> + + + + + + Date: Wed, 23 Aug 2023 16:43:52 +0800 Subject: [PATCH 5/6] [6.0.0] fix bytex problem --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 68f5f38e18..d693b38508 100644 --- a/gradle.properties +++ b/gradle.properties @@ -53,12 +53,12 @@ android.enableD8.desugaring=true android.enableDesugar=true bytex.enableHtmlLog=true bytex.forbidUseLenientMutationDuringGetArtifact=true -bytex.verifyProguardConfigurationChanged=falseikj +bytex.verifyProguardConfigurationChanged=false bytex.ASM_API=ASM7 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.9.4 +LOGLIB_VERSION=1.9.5-SNAPSHOT ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION MOGO_NETWORK_VERSION=1.4.7.12 From ed06300eacc3177a774a43e26a1083c66020ee83 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 23 Aug 2023 17:31:17 +0800 Subject: [PATCH 6/6] [6.0.0] add log --- .../java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt index cefe41b9a8..d43a8fa931 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt @@ -113,6 +113,8 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, v2XMessageEntity.content = v2XRoadEventEntity V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity) V2XBizTrace.onAck("巡航处理 handlerMessage v2XMessageEntity", " $v2XMessageEntity") + }else{ + V2XBizTrace.onAck("事件未触发", " $distance") } } }