From 370ec18cb5abb8dc47ecad8daefb6223ab593da8 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Tue, 16 Jul 2024 16:51:51 +0800
Subject: [PATCH] =?UTF-8?q?[6.4.5]=20[fea]=20[=E8=AE=BE=E7=BD=AElayout?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=92=8CdrivingStatus=E7=8A=B6=E6=80=81]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/offline/bean/BindLineListResponse.kt     | 3 +++
 .../mogo/och/offline/fragment/BaseShuttleTabFragment.java | 2 +-
 .../com/mogo/och/offline/fragment/ShuttleFragment.java    | 2 +-
 .../main/java/com/mogo/och/offline/model/OrderModel.java  | 8 --------
 .../java/com/mogo/och/offline/ui/BusStationCommonItem.kt  | 4 ++--
 .../java/com/mogo/och/offline/ui/BusSwitchLineActivity.kt | 2 +-
 .../com/mogo/och/offline/ui/adapter/SwitchLineAdapter.kt  | 5 +----
 .../java/com/mogo/och/offline/util/ShuttleVoiceManager.kt | 3 ---
 .../src/main/java/com/mogo/och/offline/view/BizMapView.kt | 6 +++---
 ...huttle_base_fragment.xml => offline_base_fragment.xml} | 2 +-
 ...{shuttle_fragment_och.xml => offline_fragment_och.xml} | 2 +-
 ...huttle_jl_bizmap_map.xml => offline_jl_bizmap_map.xml} | 0
 ...huttle_m2_bizmap_map.xml => offline_m2_bizmap_map.xml} | 0
 ...ta_common_view.xml => offline_no_data_common_view.xml} | 0
 ...{shuttle_no_line_view.xml => offline_no_line_view.xml} | 0
 ...s_common_item.xml => offline_stations_common_item.xml} | 0
 .../{shuttle_switch_line.xml => offline_switch_line.xml}  | 2 +-
 ...ne_list_item.xml => offline_switch_line_list_item.xml} | 0
 ...sk_item.xml => offline_switch_line_list_task_item.xml} | 0
 ...{shuttle_tap_position.xml => offline_tap_position.xml} | 0
 ...huttle_test_bar_view.xml => offline_test_bar_view.xml} | 0
 ...ttle_wirte_off_view.xml => offline_wirte_off_view.xml} | 0
 22 files changed, 15 insertions(+), 26 deletions(-)
 rename OCH/offline/driver/src/main/res/layout/{shuttle_base_fragment.xml => offline_base_fragment.xml} (99%)
 rename OCH/offline/driver/src/main/res/layout/{shuttle_fragment_och.xml => offline_fragment_och.xml} (99%)
 rename OCH/offline/driver/src/main/res/layout/{shuttle_jl_bizmap_map.xml => offline_jl_bizmap_map.xml} (100%)
 rename OCH/offline/driver/src/main/res/layout/{shuttle_m2_bizmap_map.xml => offline_m2_bizmap_map.xml} (100%)
 rename OCH/offline/driver/src/main/res/layout/{shuttle_no_data_common_view.xml => offline_no_data_common_view.xml} (100%)
 rename OCH/offline/driver/src/main/res/layout/{shuttle_no_line_view.xml => offline_no_line_view.xml} (100%)
 rename OCH/offline/driver/src/main/res/layout/{shuttle_stations_common_item.xml => offline_stations_common_item.xml} (100%)
 rename OCH/offline/driver/src/main/res/layout/{shuttle_switch_line.xml => offline_switch_line.xml} (98%)
 rename OCH/offline/driver/src/main/res/layout/{shuttle_switch_line_list_item.xml => offline_switch_line_list_item.xml} (100%)
 rename OCH/offline/driver/src/main/res/layout/{shuttle_switch_line_list_task_item.xml => offline_switch_line_list_task_item.xml} (100%)
 rename OCH/offline/driver/src/main/res/layout/{shuttle_tap_position.xml => offline_tap_position.xml} (100%)
 rename OCH/offline/driver/src/main/res/layout/{shuttle_test_bar_view.xml => offline_test_bar_view.xml} (100%)
 rename OCH/offline/driver/src/main/res/layout/{shuttle_wirte_off_view.xml => offline_wirte_off_view.xml} (100%)

diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BindLineListResponse.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BindLineListResponse.kt
index a95b2b984f..eb5b1d093f 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BindLineListResponse.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/bean/BindLineListResponse.kt
@@ -32,6 +32,9 @@ data class BindLineListResponse(val data: List<Result>?) : BaseData(){
         @JvmStatic
         fun getCommonLineInfo(dataItem:Result):BusRoutesResult?{
             val result = BusRoutesResult()
+            dataItem.siteList?.forEach {
+                it.drivingStatus = 3
+            }
             result.setSite(dataItem.siteList)
             result.csvFileUrl = dataItem.contrail?.csvFileUrl
             result.csvFileMd5 = dataItem.contrail?.csvFileMd5
diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/fragment/BaseShuttleTabFragment.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/fragment/BaseShuttleTabFragment.java
index 9b9c64472c..61e86e3838 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/fragment/BaseShuttleTabFragment.java
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/fragment/BaseShuttleTabFragment.java
@@ -91,7 +91,7 @@ public abstract class BaseShuttleTabFragment<V extends IView, P extends Presente
 
     @Override
     protected int getLayoutId() {
-        return R.layout.shuttle_base_fragment;
+        return R.layout.offline_base_fragment;
     }
 
     @Override
diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/fragment/ShuttleFragment.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/fragment/ShuttleFragment.java
index c468b5c6d8..bb0f5adfa7 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/fragment/ShuttleFragment.java
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/fragment/ShuttleFragment.java
@@ -418,7 +418,7 @@ public class ShuttleFragment extends BaseShuttleTabFragment<ShuttleFragment, Bus
 
     @Override
     public int getStationPanelViewId() {
-        return R.layout.shuttle_fragment_och;
+        return R.layout.offline_fragment_och;
     }
 
     @Override
diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
index 7d7ff5110e..2b21a7120b 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java
@@ -626,14 +626,6 @@ public class OrderModel {
 
         arriveStationSuccess(arrivedStationIndex, departureStopName,
                 arriveStation, arriveStationKr);
-
-        String requestId = MultiRequestLimitChecker.Companion.generateRequestId(TAG + "-arriveSiteStation"
-                , String.valueOf(stationList.get(arrivedStationIndex).getSiteId())
-                , String.valueOf(busRoutesResult.getTaskId()));
-        if (!MultiRequestLimitChecker.Companion.getInstance().canMakeRequest(requestId, 5)) {
-            CallerLogger.d(M_BUS + TAG, "arriveSiteStation-MultiRequestLimitChecker: 超过最大请求数，本次请求return");
-            return;
-        }
     }
 
     private void arriveStationSuccess(int arrivedStationIndex, String departureStopName,
diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/BusStationCommonItem.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/BusStationCommonItem.kt
index 68f5243a9b..88a7b65a85 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/BusStationCommonItem.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/BusStationCommonItem.kt
@@ -8,7 +8,7 @@ import android.widget.LinearLayout
 import androidx.core.content.ContextCompat
 import com.mogo.och.common.module.utils.BlinkAnimationUtil
 import com.mogo.och.offline.R
-import kotlinx.android.synthetic.main.shuttle_stations_common_item.view.*
+import kotlinx.android.synthetic.main.offline_stations_common_item.view.*
 
 /**
  * @author: wangmingjun
@@ -21,7 +21,7 @@ class BusStationCommonItem @JvmOverloads constructor(
 ) : LinearLayout(context, attrs, defStyleAttr){
 
     init {
-         LayoutInflater.from(context).inflate(R.layout.shuttle_stations_common_item,this,true)
+         LayoutInflater.from(context).inflate(R.layout.offline_stations_common_item,this,true)
     }
 
     fun setStationName(name: String){
diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/BusSwitchLineActivity.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/BusSwitchLineActivity.kt
index a2c14a3140..3d2d102e23 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/BusSwitchLineActivity.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/BusSwitchLineActivity.kt
@@ -42,7 +42,7 @@ class BusSwitchLineActivity : MvpActivity<BusSwitchLineView?, BusLinePresenter?>
     private val mData: MutableList<BindLineListResponse.Result> = ArrayList()
     private var checkLineInfo:BindLineListResponse.Result? = null
     override fun getLayoutId(): Int {
-        return R.layout.shuttle_switch_line
+        return R.layout.offline_switch_line
     }
 
     override fun createPresenter(): BusLinePresenter {
diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/adapter/SwitchLineAdapter.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/adapter/SwitchLineAdapter.kt
index 4b48bb6f63..c6eea35011 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/adapter/SwitchLineAdapter.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/ui/adapter/SwitchLineAdapter.kt
@@ -6,12 +6,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.core.content.ContextCompat
-import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.mogo.och.offline.R
 import com.mogo.och.offline.bean.BindLineListResponse
-import com.mogo.och.offline.bean.BusQueryLinesResponse
 import com.mogo.och.offline.ui.adapter.SwitchLineAdapter.SwitchLineViewHolder
 import kotlin.text.StringBuilder
 
@@ -34,7 +31,7 @@ class SwitchLineAdapter(
         viewType: Int
     ): SwitchLineViewHolder {
         val view = LayoutInflater.from(mContext).inflate(
-            R.layout.shuttle_switch_line_list_item, parent, false
+            R.layout.offline_switch_line_list_item, parent, false
         )
         return SwitchLineViewHolder(view)
     }
diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt
index 4a3de68466..fafac81b18 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/util/ShuttleVoiceManager.kt
@@ -13,9 +13,6 @@ import java.util.ArrayList
 object ShuttleVoiceManager {
 
     fun arrivedStationBus(siteNameCN: String?, siteNameKR: String?) {
-        if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) {
-            return
-        }
         val context = AbsMogoApplication.getApp()
         val list: MutableList<LangTtsEntity> = ArrayList()
         siteNameCN?.let {
diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/view/BizMapView.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/view/BizMapView.kt
index cf9404583e..aaaa2035a2 100644
--- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/view/BizMapView.kt
+++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/view/BizMapView.kt
@@ -25,11 +25,11 @@ class BizMapView @JvmOverloads constructor(
 
     init {
         if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) {
-            LayoutInflater.from(context).inflate(R.layout.shuttle_m2_bizmap_map, this, true)
+            LayoutInflater.from(context).inflate(R.layout.offline_m2_bizmap_map, this, true)
         }else if(AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)){
-            LayoutInflater.from(context).inflate(R.layout.shuttle_jl_bizmap_map, this, true)
+            LayoutInflater.from(context).inflate(R.layout.offline_jl_bizmap_map, this, true)
         }else{
-            LayoutInflater.from(context).inflate(R.layout.shuttle_jl_bizmap_map, this, true)
+            LayoutInflater.from(context).inflate(R.layout.offline_jl_bizmap_map, this, true)
         }
         mapBizView = findViewById(R.id.bizMapView)
     }
diff --git a/OCH/offline/driver/src/main/res/layout/shuttle_base_fragment.xml b/OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml
similarity index 99%
rename from OCH/offline/driver/src/main/res/layout/shuttle_base_fragment.xml
rename to OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml
index d2f3d0e769..cc1cdff580 100644
--- a/OCH/offline/driver/src/main/res/layout/shuttle_base_fragment.xml
+++ b/OCH/offline/driver/src/main/res/layout/offline_base_fragment.xml
@@ -200,7 +200,7 @@
 
     <include
         android:id="@+id/module_mogo_och_bus_test_bar"
-        layout="@layout/shuttle_test_bar_view"
+        layout="@layout/offline_test_bar_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="visible"
diff --git a/OCH/offline/driver/src/main/res/layout/shuttle_fragment_och.xml b/OCH/offline/driver/src/main/res/layout/offline_fragment_och.xml
similarity index 99%
rename from OCH/offline/driver/src/main/res/layout/shuttle_fragment_och.xml
rename to OCH/offline/driver/src/main/res/layout/offline_fragment_och.xml
index 0bd8d3b914..ac5e8f10c9 100644
--- a/OCH/offline/driver/src/main/res/layout/shuttle_fragment_och.xml
+++ b/OCH/offline/driver/src/main/res/layout/offline_fragment_och.xml
@@ -112,7 +112,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent" />
 
-    <include layout="@layout/shuttle_no_line_view"
+    <include layout="@layout/offline_no_line_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_160"
diff --git a/OCH/offline/driver/src/main/res/layout/shuttle_jl_bizmap_map.xml b/OCH/offline/driver/src/main/res/layout/offline_jl_bizmap_map.xml
similarity index 100%
rename from OCH/offline/driver/src/main/res/layout/shuttle_jl_bizmap_map.xml
rename to OCH/offline/driver/src/main/res/layout/offline_jl_bizmap_map.xml
diff --git a/OCH/offline/driver/src/main/res/layout/shuttle_m2_bizmap_map.xml b/OCH/offline/driver/src/main/res/layout/offline_m2_bizmap_map.xml
similarity index 100%
rename from OCH/offline/driver/src/main/res/layout/shuttle_m2_bizmap_map.xml
rename to OCH/offline/driver/src/main/res/layout/offline_m2_bizmap_map.xml
diff --git a/OCH/offline/driver/src/main/res/layout/shuttle_no_data_common_view.xml b/OCH/offline/driver/src/main/res/layout/offline_no_data_common_view.xml
similarity index 100%
rename from OCH/offline/driver/src/main/res/layout/shuttle_no_data_common_view.xml
rename to OCH/offline/driver/src/main/res/layout/offline_no_data_common_view.xml
diff --git a/OCH/offline/driver/src/main/res/layout/shuttle_no_line_view.xml b/OCH/offline/driver/src/main/res/layout/offline_no_line_view.xml
similarity index 100%
rename from OCH/offline/driver/src/main/res/layout/shuttle_no_line_view.xml
rename to OCH/offline/driver/src/main/res/layout/offline_no_line_view.xml
diff --git a/OCH/offline/driver/src/main/res/layout/shuttle_stations_common_item.xml b/OCH/offline/driver/src/main/res/layout/offline_stations_common_item.xml
similarity index 100%
rename from OCH/offline/driver/src/main/res/layout/shuttle_stations_common_item.xml
rename to OCH/offline/driver/src/main/res/layout/offline_stations_common_item.xml
diff --git a/OCH/offline/driver/src/main/res/layout/shuttle_switch_line.xml b/OCH/offline/driver/src/main/res/layout/offline_switch_line.xml
similarity index 98%
rename from OCH/offline/driver/src/main/res/layout/shuttle_switch_line.xml
rename to OCH/offline/driver/src/main/res/layout/offline_switch_line.xml
index fcd32f3b8f..7bce498646 100644
--- a/OCH/offline/driver/src/main/res/layout/shuttle_switch_line.xml
+++ b/OCH/offline/driver/src/main/res/layout/offline_switch_line.xml
@@ -66,7 +66,7 @@
     <include
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        layout="@layout/shuttle_no_data_common_view"
+        layout="@layout/offline_no_data_common_view"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"/>
 
diff --git a/OCH/offline/driver/src/main/res/layout/shuttle_switch_line_list_item.xml b/OCH/offline/driver/src/main/res/layout/offline_switch_line_list_item.xml
similarity index 100%
rename from OCH/offline/driver/src/main/res/layout/shuttle_switch_line_list_item.xml
rename to OCH/offline/driver/src/main/res/layout/offline_switch_line_list_item.xml
diff --git a/OCH/offline/driver/src/main/res/layout/shuttle_switch_line_list_task_item.xml b/OCH/offline/driver/src/main/res/layout/offline_switch_line_list_task_item.xml
similarity index 100%
rename from OCH/offline/driver/src/main/res/layout/shuttle_switch_line_list_task_item.xml
rename to OCH/offline/driver/src/main/res/layout/offline_switch_line_list_task_item.xml
diff --git a/OCH/offline/driver/src/main/res/layout/shuttle_tap_position.xml b/OCH/offline/driver/src/main/res/layout/offline_tap_position.xml
similarity index 100%
rename from OCH/offline/driver/src/main/res/layout/shuttle_tap_position.xml
rename to OCH/offline/driver/src/main/res/layout/offline_tap_position.xml
diff --git a/OCH/offline/driver/src/main/res/layout/shuttle_test_bar_view.xml b/OCH/offline/driver/src/main/res/layout/offline_test_bar_view.xml
similarity index 100%
rename from OCH/offline/driver/src/main/res/layout/shuttle_test_bar_view.xml
rename to OCH/offline/driver/src/main/res/layout/offline_test_bar_view.xml
diff --git a/OCH/offline/driver/src/main/res/layout/shuttle_wirte_off_view.xml b/OCH/offline/driver/src/main/res/layout/offline_wirte_off_view.xml
similarity index 100%
rename from OCH/offline/driver/src/main/res/layout/shuttle_wirte_off_view.xml
rename to OCH/offline/driver/src/main/res/layout/offline_wirte_off_view.xml