Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/autopilot/autopilot/OchAutoPilotStatusListenerManager.kt

@@ -273,9 +273,6 @@ object OchAutoPilotStatusListenerManager : CallerBase<IOchAutopilotStatusListene
 
     override fun onFSM2024State(fsmState: Fsm2024.FSMStateMsg) {
         fsmBackSessionId.set(fsmState.failToPilotSessionId)
-        CallerLogger.e(TAG,"收到FSM2024的SeesiongId：${fsmState.failToPilotSessionId}")
-        CallerLogger.e(TAG,"收到FSM2024的是否可启动自驾：${fsmState.pilotStandbyFlag}")
-        OchChainLogManager.writeChainLogAutopilot("FSM2024数据","收到FSM2024的SeesiongId：${fsmState.failToPilotSessionId}_收到FSM2024的是否可启动自驾：${fsmState.pilotStandbyFlag}")
         _canStartAutopilotFromFSM = fsmState.pilotStandbyFlag
     }
 

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/fragment/ShuttleFragment.kt

@@ -1,15 +1,12 @@
 package com.mogo.och.weaknet.ui.fragment
 
 import android.content.Context
-import android.graphics.BitmapFactory
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.mogo.commons.AbsMogoApplication
 import com.mogo.commons.env.ProjectUtils
 import com.mogo.commons.mvp.MvpFragment
-import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.temp.EventLogout
 import com.mogo.eagle.core.function.api.och.toolkit.IToolKitItemClickListener
@@ -17,16 +14,10 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListener
 import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
-import com.mogo.och.common.module.utils.createQRCodeWithPicture
-import com.mogo.och.common.module.wigets.BindQRCodeDialog
 import com.mogo.och.common.module.wigets.map.drawline.LineView
 import com.mogo.och.shuttle.weaknet.R
-import com.mogo.och.weaknet.ui.bizswitch.SwitchBizView
 import com.mogo.och.weaknet.ui.taskrunned.RunningTaskManager
-import kotlinx.android.synthetic.main.shuttle_weak_base_fragment.boneContainerView
 import kotlinx.android.synthetic.main.shuttle_weak_base_fragment.mapContainerLayout
-import me.jessyan.autosize.utils.AutoSizeUtils
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -65,6 +56,7 @@ class ShuttleFragment : MvpFragment<ShuttleFragment?, BusPresenter?>() {
                 override fun onItemClick(toolTag: String, ctx: Context?) {
                     when (toolTag) {
                         runningTaskGateWay -> {
+                            d(TAG, "runningTaskGateWay:$runningTaskGateWay---toolTag:$toolTag")
                             RunningTaskManager.showBadCaseConfigWindow(it)
                         }
                     }

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java

@@ -28,6 +28,7 @@ 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.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.och.common.module.wigets.map.drawline.LineView;
@@ -85,6 +86,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
                 @Override
                 public void onItemClick(@NonNull String toolTag, @Nullable Context ctx) {
                     if (runningTaskGateWay.equals(toolTag)) {
+                        CallerLogger.d(TAG,"runningTaskGateWay:"+runningTaskGateWay+"---toolTag:"+toolTag);
                         personalDialogFragment = new WeakReference<>(new TaxiPersonalDialogFragment());
                         FragmentActivity activity = getActivity();
                         if (activity != null) {

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

@@ -5,15 +5,10 @@ import android.content.Context
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.FragmentTransaction
-import com.mogo.commons.module.status.IMogoStatusChangedListener
 import com.mogo.commons.module.status.MogoStatusManager
-import com.mogo.commons.module.status.StatusDescriptor
 import com.mogo.commons.mvp.MvpFragment
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.och.toolkit.IToolKitItemClickListener
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager.getState
 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.map.CallerMapUIServiceManager
@@ -22,7 +17,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant
 import com.mogo.eagle.core.utilcode.util.ToastUtils
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import com.mogo.map.listener.IMogoMapListener
 import com.mogo.map.uicontroller.VisualAngleMode
 import com.mogo.och.common.module.biz.login.OpenOrderStatusEnum
@@ -32,20 +26,18 @@ import com.mogo.och.common.module.wigets.StartAutopilotAnimationView
 import com.mogo.och.common.module.wigets.map.drawline.LineView
 import com.mogo.och.unmanned.taxi.R
 import com.mogo.och.unmanned.taxi.constant.TaxiDriverEventConst
-import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst
 import com.mogo.och.unmanned.taxi.constant.TaxiUnmannedConst.Companion.START_AUTOPILOT_ANIMATION_INTERVAL
 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 com.mogo.och.unmanned.taxi.ui.task.TaxiTaskModel
-import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskTabFragment
 import com.mogo.och.unmanned.taxi.ui.task.itinerarycurrent.ItineraryCurrentView
 import com.mogo.och.unmanned.taxi.utils.TPRouteDataTestUtils
-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.orderDebugView
 import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.startAutopilotAnimationView
 import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.taxi_close_navi_icon
+import kotlinx.android.synthetic.main.unmanned_taxi_base_fragment.unmannedMapCL
 import java.lang.ref.WeakReference
 
 /**
@@ -106,13 +98,14 @@ class TaxiFragment :MvpFragment<TaxiFragment?, TaxiPresenter?>(),
                 object :
                     IToolKitItemClickListener {
                     override fun onItemClick(toolTag: String, ctx: Context?) {
+                        d(TAG, "外部：runningTaskGateWay:$runningTaskGateWay---toolTag:$toolTag")
                         when (toolTag) {
                             runningTaskGateWay -> {
-                                personalDialogFragment =
-                                    WeakReference(TaxiOperationalDialogFragment())
+                                d(TAG, "runningTaskGateWay:$runningTaskGateWay---toolTag:$toolTag")
+                                personalDialogFragment = WeakReference(TaxiOperationalDialogFragment())
                                 activity?.supportFragmentManager?.let {
-                                    personalDialogFragment!!.get()
-                                        ?.show(it, "service_data")
+                                    d(TAG, "runningTaskGateWay:展示view ${personalDialogFragment!!.get()}")
+                                    personalDialogFragment!!.get()?.show(it, "service_data")
                                 }
                             }
                         }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -2118,7 +2118,7 @@ internal class DebugSettingView @JvmOverloads constructor(
 
         val cityCode = mogoMapData.get()?.getCityCode()
         cityCode?.let {
-            tvHDCityCode.text = "$it"
+            tvHDCityCode.text = "高德城市码：$it"
         }
 
         tvObuConnectStatus.text = Html.fromHtml(

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml

@@ -621,6 +621,7 @@
                 <TextView
                     android:id="@+id/tvHDCityCode"
                     style="@style/DebugSettingText"
+                    android:text="高德城市码："
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content" />