From 502be42cdde7d35acb791419719bf9c5f4818709 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 6 May 2024 19:11:04 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[color=20string=20=E9=80=9A=E8=BF=87A?= =?UTF-8?q?pplication=E8=8E=B7=E5=8F=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/fragment/BaseBusTabFragment.java | 20 ++++----- .../mogo/och/bus/fragment/BusFragment.java | 41 ++++++++++--------- .../ui/BusPassengerRouteFragment.java | 19 +++++---- .../och/common/module/utils/ResourcesUtils.kt | 20 +++++++++ .../fragment/BaseShuttleTabFragment.java | 21 +++++----- .../och/shuttle/fragment/ShuttleFragment.java | 41 ++++++++++--------- .../ui/BusPassengerRouteFragment.java | 19 +++++---- .../mogo/och/taxi/ui/BaseTaxiTabFragment.java | 19 +++++---- .../ui/TaxiBeingServerdOrdersFragment.java | 5 ++- .../och/taxi/ui/TaxiGrabOrderFragment.java | 2 +- .../taxi/ui/TaxiPersonalDialogFragment.java | 5 ++- .../open/logics/location/LocationClient.kt | 2 + 12 files changed, 123 insertions(+), 91 deletions(-) create mode 100644 OCH/common/common/src/main/java/com/mogo/och/common/module/utils/ResourcesUtils.kt diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index 42fa3230ab..7be540a61c 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -48,6 +48,7 @@ import com.mogo.och.bus.util.BDRouteDataTestUtils; import com.mogo.och.bus.view.BizMapView; import com.mogo.och.bus.view.SlidePanelView; import com.mogo.och.common.module.utils.SoundPoolHelper; +import com.mogo.och.common.module.utils.ResourcesUtils; import org.greenrobot.eventbus.EventBus; @@ -348,9 +349,9 @@ public abstract class BaseBusTabFragment public void run() { tvArrived.setEnabled(isClickable); if (isClickable) { - tvArrived.setTextColor(getResources().getColor(R.color.bus_white)); + tvArrived.setTextColor(ResourcesUtils.getColor(R.color.bus_white)); } else { - tvArrived.setTextColor(getResources().getColor(R.color.bus_arrived_btn_un_clickable_color)); + tvArrived.setTextColor(ResourcesUtils.getColor(R.color.bus_arrived_btn_un_clickable_color)); } } },UiThreadHandler.MODE.QUEUE); @@ -398,7 +399,7 @@ public abstract class BaseBusTabFragment ctvAutopilotStatusTv.setTextColor(AbsMogoApplication.getApp().getColor(R.color.bus_autopilot_text_color_normal)); ctvAutopilotStatusIv.setImageResource(R.drawable.bus_ic_autopilot); if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE == autopilotStatus) { //1可用 - ctvAutopilotStatusTv.setText(getResources().getString(R.string.bus_loading_autopilot_runnig_tv)); + ctvAutopilotStatusTv.setText(ResourcesUtils.getString(R.string.bus_loading_autopilot_runnig_tv)); if(canStartAutopilt){ ctvAutopilotStatus.setClickable(true); ctvAutopilotStatus.setBackgroundResource(R.drawable.bus_autopilot_0_1_status_bg); @@ -426,14 +427,14 @@ public abstract class BaseBusTabFragment if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == autopilotStatus) {//2 running ctvAutopilotStatusIv.setImageResource(R.drawable.bus_right_autopilot_icon); - ctvAutopilotStatusTv.setTextColor(getResources().getColor(R.color.bus_autopilot_text_color_normal)); - ctvAutopilotStatusTv.setText(getResources().getString(R.string.bus_loading_autopilot_success_tv)); + ctvAutopilotStatusTv.setTextColor(ResourcesUtils.getColor(R.color.bus_autopilot_text_color_normal)); + ctvAutopilotStatusTv.setText(ResourcesUtils.getString(R.string.bus_loading_autopilot_success_tv)); // ctvAutopilotStatus.setSelected(false); ctvAutopilotStatus.setClickable(false); } else { ctvAutopilotStatusIv.setImageResource(R.drawable.bus_wrong_autopilot_icon); - ctvAutopilotStatusTv.setTextColor(getResources().getColor(R.color.bus_autopilot_text_color_normal)); - ctvAutopilotStatusTv.setText(getResources().getString(R.string.bus_loading_autopilot_failure_tv)); + ctvAutopilotStatusTv.setTextColor(ResourcesUtils.getColor(R.color.bus_autopilot_text_color_normal)); + ctvAutopilotStatusTv.setText(ResourcesUtils.getString(R.string.bus_loading_autopilot_failure_tv)); ctvAutopilotStatus.setClickable(false); // ctvAutopilotStatus.setSelected(false); } @@ -499,9 +500,8 @@ public abstract class BaseBusTabFragment */ public void startAutopilotAnimation() { isAnimateRunning = true; - ctvAutopilotStatusTv.setText(getResources().getString(R.string.bus_loading_autopilot_tv)); - ctvAutopilotStatusTv.setTextColor(getResources().getColor(R.color.bus_autopilot_text_color_normal)); -// ctvAutopilotStatus.setSelected(false); + ctvAutopilotStatusTv.setText(ResourcesUtils.getString(R.string.bus_loading_autopilot_tv)); + ctvAutopilotStatusTv.setTextColor(ResourcesUtils.getColor(R.color.bus_autopilot_text_color_normal)); ctvAutopilotStatus.setClickable(true); ctvAutopilotStatusIv.setImageResource(R.drawable.bus_loading_autopilot_icon); if (autopilotLoadingAnimator == null) { diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index c923a6f90d..54547608bb 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -39,6 +39,7 @@ import com.mogo.och.bus.view.SlidePanelView; import com.mogo.och.common.module.utils.BlinkAnimationUtil; import com.mogo.och.common.module.utils.OCHThreadPoolManager; import com.mogo.och.common.module.utils.QRUtilsKt; +import com.mogo.och.common.module.utils.ResourcesUtils; import com.mogo.och.common.module.wigets.BindQRCodeDialog; import com.mogo.och.common.module.wigets.MarqueeTextView; import com.mogo.och.common.module.wigets.OCHCommitDialog; @@ -278,23 +279,23 @@ public class BusFragment extends BaseBusTabFragment if (arrivingOrArrivedIndex == 0 || arrivingOrArrivedIndex -1 == 0 || (arrivingOrArrivedIndex -2 == 0 && stationList.size() == 3)){ - firstStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_start)); + firstStationItem.setStationTag(ResourcesUtils.getString(R.string.bus_station_txt_tag_start)); }else { firstStationItem.setStationTag(""); } if (arrivingOrArrivedIndex + 1 == stationList.size() - 1 || arrivingOrArrivedIndex == stationList.size() - 1 || (arrivingOrArrivedIndex == 0 && arrivingOrArrivedIndex + 2 == stationList.size() - 1)){ //确认是否显示 "终" - thirdStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_end)); + thirdStationItem.setStationTag(ResourcesUtils.getString(R.string.bus_station_txt_tag_end)); }else { thirdStationItem.setStationTag(""); } //圆点： 0:灰色 过站 1：绿色 到站或者即将到站 2：蓝色：未到站 if (arrivingOrArrivedIndex == 0 && isArrived){ - firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); - secondStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color)); - thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color)); + firstStationItem.setStationNameColor(ResourcesUtils.getColor(R.color.bus_line_station_color_selected)); + secondStationItem.setStationNameColor(ResourcesUtils.getColor(R.color.bus_arrived_station_name_text_color)); + thirdStationItem.setStationNameColor(ResourcesUtils.getColor(R.color.bus_arrived_station_name_text_color)); firstStationItem.setStationName(stationList.get(0).getName()); secondStationItem.setStationName(stationList.get(1).getName()); @@ -308,9 +309,9 @@ public class BusFragment extends BaseBusTabFragment secondStationItem.setStationArrowBg(2); }else if (arrivingOrArrivedIndex == stationList.size() - 1){ - firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color)); - secondStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color)); - thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); + firstStationItem.setStationNameColor(ResourcesUtils.getColor(R.color.bus_station_tag_txt_un_color)); + secondStationItem.setStationNameColor(ResourcesUtils.getColor(R.color.bus_station_tag_txt_un_color)); + thirdStationItem.setStationNameColor(ResourcesUtils.getColor(R.color.bus_line_station_color_selected)); firstStationItem.setStationName(stationList.get(arrivingOrArrivedIndex -2).getName()); secondStationItem.setStationName(stationList.get(arrivingOrArrivedIndex -1).getName()); @@ -328,9 +329,9 @@ public class BusFragment extends BaseBusTabFragment } }else { - firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color)); - secondStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); - thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color)); + firstStationItem.setStationNameColor(ResourcesUtils.getColor(R.color.bus_station_tag_txt_un_color)); + secondStationItem.setStationNameColor(ResourcesUtils.getColor(R.color.bus_line_station_color_selected)); + thirdStationItem.setStationNameColor(ResourcesUtils.getColor(R.color.bus_arrived_station_name_text_color)); firstStationItem.setStationName(stationList.get(arrivingOrArrivedIndex -1).getName()); secondStationItem.setStationName(stationList.get(arrivingOrArrivedIndex).getName()); @@ -364,23 +365,23 @@ public class BusFragment extends BaseBusTabFragment secondStationItem.showOrHideStationArrowBg(false); thirdStationItem.showOrHideStationArrowBg(false); - firstStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_start)); - thirdStationItem.setStationTag(getResources().getString(R.string.bus_station_txt_tag_end)); + firstStationItem.setStationTag(ResourcesUtils.getString(R.string.bus_station_txt_tag_start)); + thirdStationItem.setStationTag(ResourcesUtils.getString(R.string.bus_station_txt_tag_end)); firstStationItem.setStationName(stationList.get(0).getName()); thirdStationItem.setStationName(stationList.get(1).getName()); //圆点： 0:灰色 过站 1：绿色 到站或者即将到站 2：蓝色：未到站 if (arrivingOrArrivedIndex == 0 && isArrived){//到站 - firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); - thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_arrived_station_name_text_color)); + firstStationItem.setStationNameColor(ResourcesUtils.getColor(R.color.bus_line_station_color_selected)); + thirdStationItem.setStationNameColor(ResourcesUtils.getColor(R.color.bus_arrived_station_name_text_color)); firstStationItem.setStationPointBg(1); firstStationItem.setStationArrowBg(2); thirdStationItem.setStationPointBg(0); }else { - firstStationItem.setStationNameColor(getResources().getColor(R.color.bus_station_tag_txt_un_color)); - thirdStationItem.setStationNameColor(getResources().getColor(R.color.bus_line_station_color_selected)); + firstStationItem.setStationNameColor(ResourcesUtils.getColor(R.color.bus_station_tag_txt_un_color)); + thirdStationItem.setStationNameColor(ResourcesUtils.getColor(R.color.bus_line_station_color_selected)); if (isArrived){ //到终点 firstStationItem.setStationPointBg(0); firstStationItem.setStationArrowBg(0); @@ -397,10 +398,10 @@ public class BusFragment extends BaseBusTabFragment private void showOrHideSwitchLineBtn(boolean isShow) { if (isShow){//显示切换路线 mSwitchLine.setTag(0); - mSwitchLine.setText(getResources().getString(R.string.bus_switch_line_btn)); + mSwitchLine.setText(ResourcesUtils.getString(R.string.bus_switch_line_btn)); }else {//显示结束路线 mSwitchLine.setTag(1); - mSwitchLine.setText(getResources().getString(R.string.bus_close_line_btn)); + mSwitchLine.setText(ResourcesUtils.getString(R.string.bus_close_line_btn)); } } @@ -514,7 +515,7 @@ public class BusFragment extends BaseBusTabFragment //本次行程未结束，不支持切换路线。点击则toast提示：当前行程未完成，不可切换路线 if (CallerAutoPilotStatusListenerManager.INSTANCE.getState() == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { - ToastUtils.showLong(getResources().getString(R.string.bus_switch_line_btn_warning1)); + ToastUtils.showLong(ResourcesUtils.getString(R.string.bus_switch_line_btn_warning1)); return; } if ((int)mSwitchLine.getTag() == 0){//切换路线 diff --git a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java index 3e044dbf46..0e90f05d64 100644 --- a/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java +++ b/OCH/bus/passenger/src/main/java/jinlv/com/mogo/och/bus/passenger/ui/BusPassengerRouteFragment.java @@ -28,6 +28,7 @@ import com.mogo.och.bus.passenger.constant.BusPassengerConst; import com.mogo.och.bus.passenger.presenter.BaseBusPassengerPresenter; import com.mogo.och.bus.passenger.ui.layoutmanager.CenterLayoutManager; import com.mogo.och.common.module.utils.NumberFormatUtil; +import com.mogo.och.common.module.utils.ResourcesUtils; import com.mogo.och.common.module.wigets.MarqueeTextView; import com.mogo.och.common.module.wigets.OCHGradientTextView; import com.mogo.och.data.bean.BusStationBean; @@ -94,8 +95,8 @@ public class BusPassengerRouteFragment extends mSpeedTv = findViewById(R.id.bus_p_speed_tv); mSpeedTv.setVertrial(true); - mSpeedTv.setmColorList(new int[]{getResources().getColor(R.color.bus_p_speed_color_start), - getResources().getColor(R.color.bus_p_speed_color_end)}); + mSpeedTv.setmColorList(new int[]{ResourcesUtils.getColor(R.color.bus_p_speed_color_start), + ResourcesUtils.getColor(R.color.bus_p_speed_color_end)}); mNoLineInfoView =findViewById(R.id.bus_p_no_order_data_view); emptyTv = findViewById(R.id.no_order_data_tv); @@ -381,26 +382,26 @@ public class BusPassengerRouteFragment extends public void updateArrivedStation(String station,int currentIndex,boolean isArrived){ if (null == station){ mCurrentArriveStation.setText("----"); - mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title)); - mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip)); + mCurrentArriveStationTitle.setText(ResourcesUtils.getString(R.string.bus_p_cur_station_title)); + mCurrentArriveTip.setText(ResourcesUtils.getString(R.string.bus_p_cur_station_arrived_tip)); mCurrentArriveTip.setBackgroundResource(R.drawable.cur_station_arrived_bg); handleArrivingSpeakIconDrawable(); }else { mCurrentArriveStation.setText(station); if (currentIndex == 0){ - mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title)); - mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip)); + mCurrentArriveStationTitle.setText(ResourcesUtils.getString(R.string.bus_p_cur_station_title)); + mCurrentArriveTip.setText(ResourcesUtils.getString(R.string.bus_p_cur_station_arrived_tip)); mCurrentArriveTip.setBackgroundResource(R.drawable.cur_station_arrived_bg); handleArrivingSpeakIconDrawable(); return; } if (isArrived){ - mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_station_title)); - mCurrentArriveTip.setText(getResources().getString(R.string.bus_p_cur_station_arrived_tip)); + mCurrentArriveStationTitle.setText(ResourcesUtils.getString(R.string.bus_p_cur_station_title)); + mCurrentArriveTip.setText(ResourcesUtils.getString(R.string.bus_p_cur_station_arrived_tip)); mCurrentArriveTip.setBackgroundResource(R.drawable.cur_station_arrived_bg); handleArrivedSpeakIconDrawable(); }else { - mCurrentArriveStationTitle.setText(getResources().getString(R.string.bus_p_cur_next_station_title)); + mCurrentArriveStationTitle.setText(ResourcesUtils.getString(R.string.bus_p_cur_next_station_title)); mCurrentArriveTip.setBackgroundResource(R.drawable.cur_station_un_arrived_bg); handleArrivingSpeakIconDrawable(); } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/ResourcesUtils.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/ResourcesUtils.kt new file mode 100644 index 0000000000..a0b95be62d --- /dev/null +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/utils/ResourcesUtils.kt @@ -0,0 +1,20 @@ +package com.mogo.och.common.module.utils + +import android.graphics.BitmapFactory +import androidx.annotation.ColorRes +import androidx.annotation.StringRes +import androidx.core.content.ContextCompat +import com.mogo.commons.AbsMogoApplication + +object ResourcesUtils { + @JvmStatic + fun getColor(@ColorRes id: Int): Int { + return ContextCompat.getColor(AbsMogoApplication.getApp(),id) + } + + @JvmStatic + fun getString(@StringRes id: Int): String { + return AbsMogoApplication.getApp().getString(id) + } + +} diff --git a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java index 1e30f5b82c..7337247cac 100644 --- a/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java +++ b/OCH/shuttle/driver/src/main/java/com/mogo/och/shuttle/fragment/BaseShuttleTabFragment.java @@ -44,6 +44,7 @@ import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.listener.MogoMapListenerHandler; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.VisualAngleMode; +import com.mogo.och.common.module.utils.ResourcesUtils; import com.mogo.och.shuttle.R; import com.mogo.och.shuttle.view.BizMapView; import com.mogo.och.data.bean.BusRoutesResult; @@ -391,8 +392,8 @@ public abstract class BaseShuttleTabFragment