From 2644a4b6419d26d43bce94df7540b08dee432b9b Mon Sep 17 00:00:00 2001 From: aibingbing Date: Wed, 1 Nov 2023 11:36:32 +0800 Subject: [PATCH] =?UTF-8?q?[sweeper=E8=BF=90=E8=90=A5&=E4=BA=91=E6=8E=A7?= =?UTF-8?q?=E5=90=88=E5=B9=B6]refactor:=20=E4=BC=98=E5=8C=96=E6=96=87?= =?UTF-8?q?=E6=A1=88=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/sweeper/SweeperProvider.java | 7 +++++++ .../java/com/mogo/och/sweeper/common/view/DebugView.kt | 2 +- .../src/main/res/layout/sweeper_debug_view_content.xml | 8 ++++---- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java index b7dcc91413..eddc06d9ec 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/SweeperProvider.java @@ -18,7 +18,9 @@ import com.mogo.eagle.core.function.call.vehicle.CallerSweeperModeListenerManage import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.vehicle.SweeperVehicleConfigUtils; import com.mogo.eagle.core.utilcode.util.AppUtils; +import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; +import com.mogo.och.common.module.utils.ToastUtilsOch; import com.mogo.och.sweeper.cloud.fragment.SweeperCloudFragment; import com.mogo.och.sweeper.common.constant.SweeperConst; import com.mogo.och.sweeper.common.database.MyDataBase; @@ -124,19 +126,24 @@ public class SweeperProvider implements IMogoOCH, IMoGoSweeperModeListener { if (SweeperVehicleConfigUtils.isSPCurrentSweeperOperateMode()) { FunctionBuildConfig.sweeperCurrentMode = SweeperVehicleConfigUtils.BUSINESS_MODE_OPERATE; showOperateFragment(); + ToastUtils.showLong("当前清扫业务模式：运营"); } else if (SweeperVehicleConfigUtils.isSPCurrentSweeperCloudMode()) { FunctionBuildConfig.sweeperCurrentMode = SweeperVehicleConfigUtils.BUSINESS_MODE_CLOUD; showCloudFragment(); + ToastUtils.showLong("当前清扫业务模式：云控"); } else if (SweeperVehicleConfigUtils.isDefaultSweeperOperateMode(FunctionBuildConfig.sweeperDefaultMode)) { FunctionBuildConfig.sweeperCurrentMode = SweeperVehicleConfigUtils.BUSINESS_MODE_OPERATE; showOperateFragment(); + ToastUtils.showLong("当前清扫业务模式：运营"); } else if (SweeperVehicleConfigUtils.isDefaultSweeperCloudMode(FunctionBuildConfig.sweeperDefaultMode)) { FunctionBuildConfig.sweeperCurrentMode = SweeperVehicleConfigUtils.BUSINESS_MODE_CLOUD; showCloudFragment(); + ToastUtils.showLong("当前清扫业务模式：云控"); } else { // 默认云控模式 FunctionBuildConfig.sweeperCurrentMode = SweeperVehicleConfigUtils.BUSINESS_MODE_CLOUD; showCloudFragment(); + ToastUtils.showLong("当前清扫业务模式：云控"); } CallerSweeperModeListenerManager.INSTANCE.addListener(TAG, this); diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/DebugView.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/DebugView.kt index 0d1f08f54d..25eef6dae5 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/DebugView.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/common/view/DebugView.kt @@ -132,6 +132,6 @@ class DebugView @JvmOverloads constructor( } fun initView() { - currentSweeperModeTextView.text = "当前清扫模式：${FunctionBuildConfig.sweeperCurrentMode}" + currentSweeperModeTextView.text = "当前清扫业务模式：${FunctionBuildConfig.sweeperCurrentMode}" } } \ No newline at end of file diff --git a/OCH/sweeper/driver/src/main/res/layout/sweeper_debug_view_content.xml b/OCH/sweeper/driver/src/main/res/layout/sweeper_debug_view_content.xml index a2ee54c676..61b840bbd1 100644 --- a/OCH/sweeper/driver/src/main/res/layout/sweeper_debug_view_content.xml +++ b/OCH/sweeper/driver/src/main/res/layout/sweeper_debug_view_content.xml @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_10" - android:text="清扫车信息" + android:text="清扫车相关信息" android:textColor="@android:color/white" android:textSize="@dimen/dp_24" /> @@ -43,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_10" - android:text="业务流程关键节点日志（司机端）" + android:text="清扫车业务流程关键节点日志（司机端）" android:textColor="@android:color/white" android:textSize="@dimen/dp_24" /> @@ -53,8 +53,8 @@ android:layout_height="wrap_content" android:background="@drawable/sweeper_debug_view_log_history_bg" android:fadeScrollbars="false" - android:minLines="30" - android:maxLines="30" + android:minLines="28" + android:maxLines="28" android:scrollbars="vertical" android:textColor="@android:color/white" android:textSize="@dimen/dp_24" />