[6.7.0] taxi unmanual

2024-10-01 23:55:37 +08:00
parent 2e75e72df3
commit a94faacf54
7 changed files with 41 additions and 23 deletions
--- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/model/SweeperCloudTaskModel.java
+++ b/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) {
+    }
 }
--- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/operate/presenter/SweeperOperatePresenter.java
+++ b/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) {
+
+    }
 }
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/BaseTaxiTabFragment.kt
+++ b/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()
    }
--- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/base/TaxiFragment.kt
+++ b/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() {
--- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
+++ b/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"
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
@@ -57,6 +57,7 @@

    <!--Vip车辆标志-->
    <com.mogo.eagle.core.function.hmi.ui.widget.VipIdentificationView
+        android:id="@+id/viewVip"
        android:layout_width="@dimen/module_vip_width"
        android:layout_height="@dimen/module_vip_height"
        android:layout_marginStart="@dimen/dp_640"
@@ -92,6 +93,7 @@
        app:layout_constraintTop_toTopOf="parent" />

    <com.mogo.eagle.core.function.hmi.ui.widget.FusionTrafficLightView
+        android:id="@+id/viewFusionTrafficLight"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/hmi_traffic_light_layout_margin_top"
@@ -105,6 +107,7 @@

    <!--红绿灯提醒-->
    <com.mogo.eagle.core.function.hmi.ui.notice.traffic.TrafficLightPromptView
+        android:id="@+id/viewTrafficLightPrompt"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/dp_350"
@@ -117,6 +120,7 @@
        app:promptUser="driver" />

    <com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
+        android:id="@+id/viewGreenWave"
        android:layout_width="@dimen/dp_580"
        android:layout_height="@dimen/dp_129"
        android:layout_marginTop="@dimen/dp_71"
@@ -153,6 +157,7 @@

    <!--  前方路况探查  -->
    <com.mogo.eagle.core.function.view.RoadCrossRoamView
+        android:id="@+id/viewRoadCrossRoam"
        android:layout_width="@dimen/dp_654"
        android:layout_height="@dimen/dp_790"
        android:layout_marginTop="@dimen/dp_39"
@@ -165,6 +170,7 @@

    <!--  地图marker点击触发路侧直播  -->
    <com.mogo.eagle.core.function.hmi.ui.camera.RoadCrossLiveView
+        android:id="@+id/viewRoadCrossLive"
        android:layout_width="@dimen/dp_800"
        android:layout_height="@dimen/dp_560"
        android:layout_marginTop="@dimen/dp_333"
@@ -177,6 +183,7 @@

    <!--pnc行为决策-->
    <com.mogo.eagle.core.function.hmi.ui.vehicle.PncActionsView
+        android:id="@+id/viewPncActions"
        android:layout_width="wrap_content"
        android:layout_height="@dimen/dp_100"
        android:layout_marginBottom="@dimen/dp_110"
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt
@@ -295,6 +295,7 @@ class RoadCrossRoamView @JvmOverloads constructor(
        if (lightMode) {
            ivZhiRoadRoamView.clearAnimation()
        }
+        mapRoamView.onDestroy()
        CallerMapRoadListenerManager.removeListener(TAG)
        CallerHmiViewControlListenerManager.removeListener(TAG)
    }