From 1a1f0bd8d65932576fe2b9c42f5f8ec6bd6bb8d0 Mon Sep 17 00:00:00 2001 From: yakunyang Date: Thu, 13 Jun 2024 15:19:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[6.4.4]=20[fea]=20UI=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OCH/common/common/src/main/res/drawable/common_error_vin.xml | 2 +- OCH/common/common/src/main/res/layout/common_checkvin_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OCH/common/common/src/main/res/drawable/common_error_vin.xml b/OCH/common/common/src/main/res/drawable/common_error_vin.xml index b1c9ea3dd1..2708761c00 100644 --- a/OCH/common/common/src/main/res/drawable/common_error_vin.xml +++ b/OCH/common/common/src/main/res/drawable/common_error_vin.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/OCH/common/common/src/main/res/layout/common_checkvin_view.xml b/OCH/common/common/src/main/res/layout/common_checkvin_view.xml index ba1106404e..b4fb235d1a 100644 --- a/OCH/common/common/src/main/res/layout/common_checkvin_view.xml +++ b/OCH/common/common/src/main/res/layout/common_checkvin_view.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="@dimen/dp_939" android:layout_height="wrap_content" - android:background="@color/common_3B4577"> + android:background="@drawable/common_error_vin"> Date: Thu, 13 Jun 2024 17:42:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[6.4.4]=20[fea]=20=E5=BA=95=E7=9B=98?= =?UTF-8?q?=E7=BB=99vin=E4=BF=A1=E6=81=AF=E6=97=B6=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/manager/device/checkvin/CheckVinManager.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/checkvin/CheckVinManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/checkvin/CheckVinManager.kt index c859036e4e..f2ccd5102e 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/checkvin/CheckVinManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/device/checkvin/CheckVinManager.kt @@ -1,7 +1,8 @@ package com.mogo.och.common.module.manager.device.checkvin -import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisDoorStateListener +import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotCarConfigListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager +import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.common.module.biz.login.LoginStatusManager @@ -9,16 +10,22 @@ import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager import com.mogo.och.common.module.manager.loop.BizLoopManager import com.mogo.och.common.module.manager.loop.LoopInfo import io.reactivex.schedulers.Schedulers +import mogo.telematics.pad.MessagePad -object CheckVinManager : IMoGoChassisDoorStateListener { +object CheckVinManager : IMoGoAutopilotCarConfigListener { private val TAG = CheckVinManager::class.java.simpleName init { BizLoopManager.setLoopFunction(TAG, LoopInfo(60*5,::checkVin,scheduler = Schedulers.io())) + CallerAutopilotCarConfigListenerManager.addListener(TAG,this) } private var checkVinErrorDialog:CheckVinErrorDialog?=null + override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) { + checkVin() + } + private fun checkVin() { LoginStatusManager.getLoginInfo()?.let {loginInfo -> val serverVin = loginInfo.vin From dd0926c1718c19d5c675a182f7c6a580b7822941 Mon Sep 17 00:00:00 2001 From: yakunyang Date: Thu, 13 Jun 2024 17:42:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[6.4.4]=20[fea]=20=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/autopilot/autopilot/OchAutopilotAnalytics.kt | 2 +- .../module/manager/logchainanalytic/OchChainLogManager.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutopilotAnalytics.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutopilotAnalytics.kt index 3a54ba1940..e3b94e0c1b 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutopilotAnalytics.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutopilotAnalytics.kt @@ -39,7 +39,7 @@ abstract class OchAutopilotAnalytics { private const val EVENT_KEY_START_AUTOPILOT_ACK = "event_key_och_start_autopilot_ack" private const val EVENT_PARAM_START_AUTOPILOT_ACK= "start_autopilot_parameters_ack" // 启动自驾参数 - private const val EVENT_PARAM_START_AUTOPILOT_ACK_SUCCESS= "start_autopilot_parameters_ack" // 启动自驾参数 + private const val EVENT_PARAM_START_AUTOPILOT_ACK_SUCCESS= "start_autopilot_parameters_ack_isSuccess" // 启动自驾参数 private const val EVENT_KEY_INFO_AUTOPILOT_DISTANCE = "event_key_vehicle_start_autopilot_state_distance_15" diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt index c30a10e3df..4d6b642322 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/manager/logchainanalytic/OchChainLogManager.kt @@ -86,9 +86,9 @@ object OchChainLogManager { val plateNum = AppConfigInfo.plateNumber params["sn"] = SharedPrefsMgr.getInstance().sn params["env"] = DebugConfig.getNetMode() - params["product"] = AppIdentityModeUtils.getProduct(FunctionBuildConfig.appIdentityMode) - params["role"] = AppIdentityModeUtils.getRole(FunctionBuildConfig.appIdentityMode) - params["cartype"] = AppIdentityModeUtils.getCarType(FunctionBuildConfig.appIdentityMode) + params["product"] = AppIdentityModeUtils.getProduct(FunctionBuildConfig.appIdentityMode).name + params["role"] = AppIdentityModeUtils.getRole(FunctionBuildConfig.appIdentityMode).name + params["cartype"] = AppIdentityModeUtils.getCarType(FunctionBuildConfig.appIdentityMode).name params["plate_number"] = if (TextUtils.isEmpty(plateNum)) "" else plateNum params["time"] = DateTimeUtils.getTimeText(DateTimeUtils.yyyy_MM_dd_HH_mm_ss_SSS) } From 6b6970e3732d0db81817beebf790c5373421892e Mon Sep 17 00:00:00 2001 From: yakunyang Date: Fri, 14 Jun 2024 10:52:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[6.4.4]=20[fea]=20=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?ResourcesUtils?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/ui/BusSwitchLineActivity.kt | 3 +- .../passenger/ui/PM2DrivingInfoFragment.kt | 29 ++++----- .../och/charter/base/CharterBaseFragment.kt | 7 ++- .../mogo/och/taxi/ui/BaseTaxiTabFragment.java | 63 ++++++++++++------- 4 files changed, 60 insertions(+), 42 deletions(-) diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt index e85c5aea90..cf4e580bc1 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.kt @@ -21,6 +21,7 @@ import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration import com.mogo.eagle.core.utilcode.util.ToastUtils import com.mogo.och.bus.R import com.mogo.och.bus.bean.response.BusQueryLineTaskResponse +import com.mogo.och.common.module.utils.ResourcesUtils import java.util.ArrayList /** @@ -139,7 +140,7 @@ class BusSwitchLineActivity : MvpActivity } override fun onChangeLineIdSuccess() { - ToastUtils.showLong(resources.getString(R.string.bus_change_line_commit_tip_s)) + ToastUtils.showLong(ResourcesUtils.getString(R.string.bus_change_line_commit_tip_s)) mPresenter?.queryBusRoutes() mAdapter.setOnLineItemClickListener(null) mPresenter?.removeListener() diff --git a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2DrivingInfoFragment.kt index f8b2c199c6..fbc4a1686a 100644 --- a/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2DrivingInfoFragment.kt +++ b/OCH/bus/passenger/src/main/java/m2/com/mogo/och/bus/passenger/passenger/ui/PM2DrivingInfoFragment.kt @@ -15,6 +15,7 @@ import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.passenger.presenter.PM2DrivingPresenter import com.mogo.och.common.module.utils.DateTimeUtil.* import com.mogo.och.common.module.utils.NumberFormatUtil +import com.mogo.och.common.module.utils.ResourcesUtils import com.mogo.och.data.bean.BusStationBean import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.auto_tv import kotlinx.android.synthetic.main.bus_p_m2_driving_info_fragment.clg_distance_left_time @@ -66,12 +67,12 @@ class PM2DrivingInfoFragment : true } - line_name_tv.setTextColor(resources.getColor(R.color.bus_p_m2_line_name_tv_color)) - station_name_tv.setTextColor(resources.getColor(R.color.bus_p_m2_line_name_tv_color)) + line_name_tv.setTextColor(ResourcesUtils.getColor(R.color.bus_p_m2_line_name_tv_color)) + station_name_tv.setTextColor(ResourcesUtils.getColor(R.color.bus_p_m2_line_name_tv_color)) speed_tv.setVertrial(true) val intArrayOf = intArrayOf( - requireContext().resources.getColor(R.color.bus_p_m2_color_43cefe), - requireContext().resources.getColor(R.color.bus_p_m2_color_1466fb) + ResourcesUtils.getColor(R.color.bus_p_m2_color_43cefe), + ResourcesUtils.getColor(R.color.bus_p_m2_color_1466fb) ) speed_tv.setmColorList(intArrayOf) @@ -152,7 +153,7 @@ class PM2DrivingInfoFragment : } fun showNoTaskView(){ - line_name_tv.text = resources.getString(R.string.bus_p_m2_not_select_line_content) + line_name_tv.text = ResourcesUtils.getString(R.string.bus_p_m2_not_select_line_content) updateNoStationView() overMapView?.let { it.clearSiteMarkers() @@ -166,10 +167,10 @@ class PM2DrivingInfoFragment : } } private fun updateNoStationView(){ - station_name_tv.setTextColor(resources.getColor(R.color.bus_p_m2_next_tv_color)) - station_name_tv.text = resources.getString(R.string.bus_p_m2_empty_tv) - tv_distance.text = resources.getString(R.string.bus_p_m2_empty_remain_km) - tv_left_time.text = resources.getString(R.string.bus_p_m2_empty_remain_minute) + station_name_tv.setTextColor(ResourcesUtils.getColor(R.color.bus_p_m2_next_tv_color)) + station_name_tv.text = ResourcesUtils.getString(R.string.bus_p_m2_empty_tv) + tv_distance.text = ResourcesUtils.getString(R.string.bus_p_m2_empty_remain_km) + tv_left_time.text = ResourcesUtils.getString(R.string.bus_p_m2_empty_remain_minute) noLineShow() } @@ -214,19 +215,19 @@ class PM2DrivingInfoFragment : fun updateStationsInfo(stations: MutableList, currentStationIndex: Int, isArrived: Boolean){ if (stations.size == 0) return if (0<= currentStationIndex && currentStationIndex?>() : flStationPanelContainer = findViewById(R.id.module_mogo_och_station_panel_container) slidePanelView = findViewById(R.id.charter_slide_panel) - slidePanelView?.setText(resources.getString(R.string.charter_back_car)) + slidePanelView?.setText(ResourcesUtils.getString(R.string.charter_back_car)) slidePanelView?.setOnSlidePanelMoveToEndListener(onSlideToEndListener) @@ -191,9 +192,9 @@ abstract class CharterBaseFragment?>() : requireActivity().runOnUiThread { module_mogo_och_arrived_tv.isEnabled = isClickable if (isClickable) { - module_mogo_och_arrived_tv.setTextColor(resources.getColor(android.R.color.white)) + module_mogo_och_arrived_tv.setTextColor(ResourcesUtils.getColor(android.R.color.white)) } else { - module_mogo_och_arrived_tv.setTextColor(resources.getColor(R.color.charter_arrived_btn_un_clickable_color)) + module_mogo_och_arrived_tv.setTextColor(ResourcesUtils.getColor(R.color.charter_arrived_btn_un_clickable_color)) } } } diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index cc2bc79bea..54049cdb98 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -233,20 +233,23 @@ public abstract class BaseTaxiTabFragment { - if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != status) { - // 1. 主动开启自动驾驶中，不为2（为0、1）则继续loading - return; + UiThreadHandler.post(new Runnable() { + @Override + public void run() { + if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != status) { + // 1. 主动开启自动驾驶中，不为2（为0、1）则继续loading + return; + } + if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == status) { + // 2. 主动开启自动驾驶中，为2则停止loading，并isStarting = false + startAutopilotDone(true); + return; + } + // 3. 其他过程直接更新 + startOrStopLoadingAnim(false); + autopilotStatusAnimchanged(status,canStart); } - if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == status) { - // 2. 主动开启自动驾驶中，为2则停止loading，并isStarting = false - startAutopilotDone(true); - return; - } - // 3. 其他过程直接更新 - startOrStopLoadingAnim(false); - autopilotStatusAnimchanged(status,canStart); - }); + },UiThreadHandler.MODE.QUEUE); } public void stopAnimAndUpdateBtnStatus() { @@ -302,6 +305,9 @@ public abstract class BaseTaxiTabFragment { - flStationPanelContainer.setVisibility(View.GONE); - }); + UiThreadHandler.post(new Runnable() { + @Override + public void run() { + flStationPanelContainer.setVisibility(View.GONE); + } + },UiThreadHandler.MODE.QUEUE); } public void showPanel() { - getActivity().runOnUiThread(() -> { - flStationPanelContainer.setVisibility(View.VISIBLE); - }); + UiThreadHandler.post(new Runnable() { + @Override + public void run() { + flStationPanelContainer.setVisibility(View.VISIBLE); + } + },UiThreadHandler.MODE.QUEUE); } /** @@ -400,12 +412,15 @@ public abstract class BaseTaxiTabFragment { - if (tvOperationStatus == null) { - return; + UiThreadHandler.post(new Runnable() { + @Override + public void run() { + if (tvOperationStatus == null) { + return; + } + tvOperationStatus.setVisibility(visible); } - tvOperationStatus.setVisibility(visible); - }); + },UiThreadHandler.MODE.QUEUE); } protected void showAmapNaviToStationFragment(boolean isShow) {