From c1ee3cc1097274d83020ac8f041922ea9c293894 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Wed, 2 Aug 2023 11:24:01 +0800
Subject: [PATCH] =?UTF-8?q?[6.0.0]=20taxi=E6=97=A0=E4=BA=BA=E5=8C=96?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AEsaas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/taxi/ui/TaxiServerOrdersFragment.kt     | 17 ++++++++---------
 app/script/flavorfilter/flavors.json            | 10 +++++-----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.kt b/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.kt
index 3731b55c30..90835231da 100644
--- a/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.kt
+++ b/OCH/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.kt
@@ -12,7 +12,6 @@ import androidx.annotation.RequiresApi
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
-import androidx.viewpager.widget.ViewPager
 import androidx.viewpager.widget.ViewPager.OnPageChangeListener
 import com.google.android.material.tabs.TabLayout
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
@@ -32,7 +31,7 @@ class TaxiServerOrdersFragment : BaseBindingFragment<TaxiServerOrdersPanelBindin
 }) {
     private val mTabTitles = arrayOf("进行中", "待服务")
     private val fragments: MutableList<Fragment> = ArrayList()
-    private var beingServedOrdersFragment: TaxiBeingTaskFragment? = null
+    private var beingTaskFragment: TaxiBeingTaskFragment? = null
     private var reserveOrdersFragment: TaxiReserveOrderFragment? = null
     override fun getLayoutId(): Int {
         return R.layout.taxi_server_orders_panel
@@ -58,11 +57,11 @@ class TaxiServerOrdersFragment : BaseBindingFragment<TaxiServerOrdersPanelBindin
             if (0 == i) {
                 binding.moduleOchTaxiTab.addTab(tab, true)
                 changeTabLayoutTabUI(tab, true)
-                beingServedOrdersFragment = TaxiBeingTaskFragment.newInstance(
+                beingTaskFragment = TaxiBeingTaskFragment.newInstance(
                     activity,
                     parentFragment as TaxiFragment?
                 )
-                fragments.add(beingServedOrdersFragment!!)
+                fragments.add(beingTaskFragment!!)
             } else if (1 == i) {
                 binding.moduleOchTaxiTab.addTab(tab)
                 changeTabLayoutTabUI(tab, false)
@@ -157,19 +156,19 @@ class TaxiServerOrdersFragment : BaseBindingFragment<TaxiServerOrdersPanelBindin
 
     @RequiresApi(api = Build.VERSION_CODES.P)
     fun updateCurrentOrderStatusChanged(order: OrderQueryRespBean.Result?) {
-        if (beingServedOrdersFragment != null) {
+        if (beingTaskFragment != null) {
             binding.moduleOchTaxiTab.getTabAt(0)?.select()
-            beingServedOrdersFragment!!.updateCurrentOrderStatusChanged(order)
+            beingTaskFragment!!.updateCurrentOrderStatusChanged(order)
         }
     }
 
     fun onNaviToEndAMap(isShow: Boolean) {
-        if (null == beingServedOrdersFragment) return
-        beingServedOrdersFragment!!.onNaviToEndAmap(isShow)
+        if (null == beingTaskFragment) return
+        beingTaskFragment!!.onNaviToEndAmap(isShow)
     }
 
     companion object {
-        const val TAG = "TaxiFragment"
+        const val TAG = "TaxiServerOrdersFragment"
         fun newInstance(): TaxiServerOrdersFragment {
             val args = Bundle()
             val fragment = TaxiServerOrdersFragment()
diff --git a/app/script/flavorfilter/flavors.json b/app/script/flavorfilter/flavors.json
index bd68a161e1..d38b314f89 100644
--- a/app/script/flavorfilter/flavors.json
+++ b/app/script/flavorfilter/flavors.json
@@ -18,11 +18,6 @@
       "driverPassenger": ["ochDFHQ"],
       "passenger": ["ochDFHQ"]
     },
-    "taxiunmanned" :{
-      "driver": ["ochDFHQ"],
-      "driverpassenger": ["ochDFHQ"],
-      "passenger": ["ochDFHQ"]
-    },
     "bus" :{
       "driver": ["ochJL"],
       "driverPassenger": ["ochJL"],
@@ -57,6 +52,11 @@
     }
   },
   "saas": {
+    "taxiunmanned" :{
+      "driver": ["ochDFHQ"],
+      "driverpassenger": ["ochDFHQ"],
+      "passenger": ["ochDFHQ"]
+    },
     "shuttle" :{
       "driver": ["ochJL","ochM2"],
       "passenger": ["ochJL","ochM2"]