[6.4.5]

[fea]
[设置layout名称和drivingStatus状态]

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

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

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

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,

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){

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 {

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)
     }

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 {

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)
     }

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"

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"

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"/>