From 4bf929cae04ca488ec19c6e0f61c5daa415931f5 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Sun, 8 Oct 2023 11:04:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[6.1.0][Fix]=E8=A7=A3=E5=86=B3=E5=8F=AF?= =?UTF-8?q?=E5=B9=B3=E8=A1=8C=E9=A9=BE=E9=A9=B6=E7=8A=B6=E6=80=81=E4=B8=8D?= =?UTF-8?q?=E5=87=86=E5=AF=BC=E8=87=B4=E7=9A=84UI=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/function/hmi/ui/widget/ParallelDriveView.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt index 6d3b9e4e4c..5b8d49477c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ParallelDriveView.kt @@ -126,6 +126,7 @@ class ParallelDriveView @JvmOverloads constructor( isAutoDriving = false Log.d(TAG, "onAutopilotStatusResponse-7") ThreadUtils.runOnUiThread({ + this.state = PARALLEL_DRIVING updateUI(PARALLEL_DRIVING) }, ThreadUtils.MODE.QUEUE) } @@ -159,12 +160,14 @@ class ParallelDriveView @JvmOverloads constructor( if (!isParallelDrivingAbility) { Log.d(TAG, "onParallelDrivingAbility-UNAVAILABLE") ThreadUtils.runOnUiThread({ + if (state == PARALLEL_DRIVING) return@runOnUiThread state = UNAVAILABLE updateUI(UNAVAILABLE) }, ThreadUtils.MODE.QUEUE) } else { Log.d(TAG, "onParallelDrivingAbility-AVAILABLE") ThreadUtils.runOnUiThread({ + if (state == PARALLEL_DRIVING) return@runOnUiThread state = 0 updateUI(0) }, ThreadUtils.MODE.QUEUE) From e78dfd1d015b0a66538aebb9c3d468ac0ce8ad5c Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Sun, 8 Oct 2023 11:32:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[6.1.0]=20=E8=A7=A3=E5=86=B3=E9=80=80?= =?UTF-8?q?=E5=87=BA=E7=99=BB=E5=BD=95=E5=86=8D=E7=99=BB=E5=BD=95,=20120s?= =?UTF-8?q?=E6=8B=89=E5=8F=96=E4=BB=BB=E5=8A=A1=E5=80=92=E8=AE=A1=E6=97=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/ui/base/TaxiPresenter.java | 2 ++ .../main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java index f33af0258c..8fc079b3bb 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/base/TaxiPresenter.java @@ -211,6 +211,8 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS if (!TaxiTaskModel.INSTANCE.checkCurrentTaskCondition()) { mView.showDebugPanel(); } + + TaxiTaskModel.INSTANCE.updatePrepareTaskDelayUI(); } @Override diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index 745dfa717b..53d97c34e4 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -1468,4 +1468,13 @@ object TaxiTaskModel { listener.onStartAutopilot(remainingTime) } } + + fun updatePrepareTaskDelayUI() { + if (!TaxiCarServingStatusManager.isCarServingStatus()){ + mTaxiTaskWithOrderCallbackMap.forEach { + val listener = it.value + listener.onStartPrepareTaskUI(0, false) + } + } + } } \ No newline at end of file From 3be5391acaa85a20fe43601051b8289e00820a9d Mon Sep 17 00:00:00 2001 From: zhongchao Date: Sun, 8 Oct 2023 15:31:13 +0800 Subject: [PATCH 3/4] [6.1.0] add func of trace log enable and change the msgbox move to datacenter start --- .../mogo/eagle/core/function/DataCenterProvider.kt | 2 ++ .../DevaToolsProvider.kt | 4 ++++ .../trace/TraceManager.kt | 12 +++++++++++- .../core/function/hmi/ui/setting/DebugSettingView.kt | 11 +++++++++++ .../core/function/main/MainMoGoApplication.java | 2 -- .../src/main/res/layout/view_debug_setting.xml | 11 +++++++++++ .../function/api/devatools/IDevaToolsProvider.kt | 5 +++++ .../call/devatools/CallerDevaToolsManager.kt | 7 +++++++ gradle.properties | 2 +- 9 files changed, 52 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/DataCenterProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/DataCenterProvider.kt index 5ec60c934b..2d6a69a955 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/DataCenterProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/DataCenterProvider.kt @@ -4,6 +4,7 @@ import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.datacenter.IDataCenterProvider +import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.function.datacenter.location.MoGoLocationDispatcher import com.mogo.eagle.core.function.datacenter.v2x.SpeedLimitDispatcher import com.mogo.eagle.core.function.datacenter.v2x.TrafficLightDispatcher @@ -18,6 +19,7 @@ class DataCenterProvider: IDataCenterProvider { MoGoLocationDispatcher.initListener() context?.let { + CallerMsgBoxManager.queryAllMessages(it) TrafficLightDispatcher.INSTANCE.initServer(it) SpeedLimitDispatcher.INSTANCE.initLimit(it) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index 821101bcb9..8c4130608a 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt @@ -240,6 +240,10 @@ class DevaToolsProvider : IDevaToolsProvider { traceManager.setTraceLogEnable(enable) } + override fun setTraceEnable(enable: Boolean) { + traceManager.setTraceEnable(enable) + } + override fun getTraceInfo(): HashMap { return traceManager.getTraceInfo() } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt index d42f41c25e..ecf880c9c6 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt @@ -13,6 +13,7 @@ import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_DEVA +import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr import com.mogo.eagle.core.utilcode.util.Utils import com.zhidao.loglib.call.LogInfoManagerFactory import com.zhidao.loglib.fw.FileWriteManager @@ -37,6 +38,7 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { companion object { const val TAG = "TraceManager" + private const val TRACE_ENABLE = "TRACE_ENABLE" private const val DELAY_UPLOAD = 60 * 60 * 1000L val traceManager by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { @@ -119,7 +121,11 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { } CallerDevaToolsListenerManager.invokeDevaToolsFwThreadClose() } - delayUpload() + val traceEnable = SharedPrefsMgr.getInstance(context).getBoolean(TRACE_ENABLE,true) + FileWriteManager.getInstance().setCloseRecord(traceEnable) + if(traceEnable){ + delayUpload() + } init = true } @@ -136,6 +142,10 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { FileWriteManager.getInstance().logger = enable } + fun setTraceEnable(enable: Boolean) { + FileWriteManager.getInstance().setCloseRecord(enable) + } + fun getTraceLogStatus(): Boolean { return FileWriteManager.getInstance().logger } 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 4aab1e39e6..57e0ff496f 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 @@ -66,6 +66,7 @@ import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.logcatch.ILogViewListener import com.mogo.eagle.core.function.hmi.ui.logcatch.LogInfoView +import com.mogo.eagle.core.function.hmi.ui.utils.HmiActionLog import com.mogo.eagle.core.utilcode.kotlin.currentPadding import com.mogo.eagle.core.utilcode.kotlin.lifecycleOwner import com.mogo.eagle.core.utilcode.kotlin.onClick @@ -1352,6 +1353,16 @@ internal class DebugSettingView @JvmOverloads constructor( mogoMapData.get()?.setDebugMode(isChecked) } + /** + * 设置是否开启pre check, true-打开，false-关闭 + */ + tbPreCheckEnable.isChecked = SharedPrefsMgr.getInstance(context).getBoolean("TRACE_ENABLE",true) + tbPreCheckEnable.setOnCheckedChangeListener { _, isChecked -> + HmiActionLog.hmiAction(TAG + "TRACE_ENABLE",isChecked) + SharedPrefsMgr.getInstance(context).putBoolean("TRACE_ENABLE",isChecked) + CallerDevaToolsManager.setTraceEnable(isChecked) + } + cbTraceLog.isChecked = CallerDevaToolsManager.getTraceLogStatus() //链路Log输出日志 cbTraceLog.setOnCheckedChangeListener { _, isChecked -> diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 8d24b5c6b2..8912c45ec6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -46,8 +46,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { initTipToast(); initModules(); - //todo - CallerMsgBoxManager.INSTANCE.queryAllMessages(this); } /** 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 dd886db100..2fab2db75c 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 @@ -2099,6 +2099,17 @@ android:textOn="关闭「HD-MAP」Log" android:textSize="@dimen/dp_24" /> + + Date: Sun, 8 Oct 2023 15:35:05 +0800 Subject: [PATCH 4/4] [6.1.0] change the text --- .../eagle/core/function/hmi/ui/setting/DebugSettingView.kt | 4 ++-- .../src/main/res/layout/view_debug_setting.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 57e0ff496f..c3f19c6a35 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 @@ -1356,8 +1356,8 @@ internal class DebugSettingView @JvmOverloads constructor( /** * 设置是否开启pre check, true-打开，false-关闭 */ - tbPreCheckEnable.isChecked = SharedPrefsMgr.getInstance(context).getBoolean("TRACE_ENABLE",true) - tbPreCheckEnable.setOnCheckedChangeListener { _, isChecked -> + tbTraceEnable.isChecked = SharedPrefsMgr.getInstance(context).getBoolean("TRACE_ENABLE",true) + tbTraceEnable.setOnCheckedChangeListener { _, isChecked -> HmiActionLog.hmiAction(TAG + "TRACE_ENABLE",isChecked) SharedPrefsMgr.getInstance(context).putBoolean("TRACE_ENABLE",isChecked) CallerDevaToolsManager.setTraceEnable(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 2fab2db75c..a306e10e77 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 @@ -2100,14 +2100,14 @@ android:textSize="@dimen/dp_24" />