[6.7.0] taxi unmanual

OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java

@@ -792,4 +792,12 @@ public class SweeperCloudTaskModel implements IMoGoSweeperFutianCloudTaskListene
     public void onAutopilotStatusResponseFromCan(int state) {
 
     }
+
+    @Override·
+    public void onAutoPilotInfo(long token, long timestamp, @Nullable SsmInfo.AutoPilotInfo autoPilotInfo) {
+    }
+
+    @Override
+    public void onAutoPilotStation(long token, long timestamp, @Nullable SsmInfo.AutoPilotStation autoPilotStation) {
+    }
 }

OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperOperatePresenter.java

@@ -469,4 +469,14 @@ public class SweeperOperatePresenter extends Presenter<SweeperOperateFragment>
     public void onAutopilotStatusResponseFromCan(int state) {
 
     }
+
+    @Override
+    public void onAutoPilotInfo(long token, long timestamp, @Nullable SsmInfo.AutoPilotInfo autoPilotInfo) {
+
+    }
+
+    @Override
+    public void onAutoPilotStation(long token, long timestamp, @Nullable SsmInfo.AutoPilotStation autoPilotStation) {
+
+    }
 }

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt

@@ -16,7 +16,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
 import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager
-import com.mogo.eagle.core.function.hmi.map.MapContainerLayout
 import com.mogo.eagle.core.function.view.MapRoamView
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.map.listener.IMogoMapListener
@@ -27,6 +26,7 @@ import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst
 import com.mogo.och.unmanned.taxi.ui.navi.amap.TaxiAmapNaviFragment
 import com.mogo.och.unmanned.taxi.ui.navi.auto.TaxiRoutingNaviFragment
 import com.mogo.och.unmanned.taxi.ui.operational.TaxiOperationalDialogFragment
+import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.unmannedMapCL
 import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.module_mogo_och_navi_panel_container
 import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.taxi_close_navi_icon
 import java.lang.ref.WeakReference
@@ -47,8 +47,6 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
     // 高德地图轨迹展示fragment
     private var taxiRoutingNaviFragment: TaxiRoutingNaviFragment? = null
 
-    private val mapRoamView: MapRoamView? = null
-    private val mapContainerLayout: MapContainerLayout? = null
     private val runningTaskGateWay = "RUNNINGTASKGATEWAY"
     private val lineView = "LINEVIEW"
     private var personalDialogFragment: WeakReference<TaxiOperationalDialogFragment>? = null
@@ -118,39 +116,33 @@ abstract class BaseTaxiTabFragment<V : IView, P : Presenter<V>> : MvpFragment<V,
 
     override fun initViews(savedInstanceState: Bundle?) {
         super.initViews(savedInstanceState)
-        mapContainerLayout!!.onCreate(savedInstanceState)
-        mapRoamView!!.onCreate(savedInstanceState)
+        unmannedMapCL.onCreate(savedInstanceState)
     }
 
     override fun onResume() {
         super.onResume()
-        mapContainerLayout!!.onResume()
-        mapRoamView!!.onResume()
+        unmannedMapCL.onResume()
     }
 
     override fun onPause() {
         super.onPause()
-        mapContainerLayout!!.onPause()
-        mapRoamView!!.onPause()
+        unmannedMapCL.onPause()
     }
 
     protected open fun onChangeOperationStatus() {}
 
     override fun onLowMemory() {
         super.onLowMemory()
-        mapContainerLayout!!.onLowMemory()
-        mapRoamView!!.onLowMemory()
+        unmannedMapCL.onLowMemory()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        mapContainerLayout!!.onSaveInstanceState(outState)
-        mapRoamView!!.onSaveInstanceState(outState)
+        unmannedMapCL.onSaveInstanceState(outState)
     }
 
     override fun onDestroyView() {
-        mapContainerLayout!!.onDestroy()
-        mapRoamView!!.onDestroy()
+        unmannedMapCL.onDestroy()
         CallerAutopilotRecordListenerManager.removeListener(TAG)
         super.onDestroyView()
     }

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt

@@ -169,13 +169,13 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
                 routingVerifyFragment = null
             }
         }
-        if (taskTabFragment?.get() == null) {
-            taskTabFragment = WeakReference(TaxiTaskTabFragment.newInstance())
-        }
-        taskTabFragment?.get()?.also {
-            transaction.replace(R.id.fragment_container, it).show(it)
-            transaction.commitAllowingStateLoss()
-        }
+//        if (taskTabFragment?.get() == null) {
+//            taskTabFragment = WeakReference(TaxiTaskTabFragment.newInstance())
+//        }
+//        taskTabFragment?.get()?.also {
+//            transaction.replace(R.id.fragment_container, it).show(it)
+//            transaction.commitAllowingStateLoss()
+//        }
     }
 
     private fun showRoutingFragment() {

OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml

@@ -6,7 +6,7 @@
     android:layout_height="match_parent">
 
     <com.mogo.eagle.core.function.hmi.map.MapContainerLayout
-        android:id="@+id/mapContainerLayout"
+        android:id="@+id/unmannedMapCL"
         android:layout_width="1860dp"
         android:layout_height="1533dp"
         android:layout_marginTop="@dimen/dp_76"