[6.1.0]

[charter]
[包车掉头提示+注释]

OCH/charter/driver/src/driverm1/java/com/magic/mogo/och/charter/manager/CharterTrajectoryManager.kt

@@ -87,7 +87,17 @@ object CharterTrajectoryManager {
             // 5. 轨迹管理_轨迹下载超时
             d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() 轨迹下载超时")
             // ToastUtils.showShort("轨迹下载超时");
-        }  else if ("ISSM_FUNC_AUTO_PILOT_READY" == guardianInfo.getCode()) {
+        } else if ("EMAP_ATTITUDE_INIT_FAILED" == guardianInfo.getCode()) {
+            CallerMsgBoxManager.saveMsgBox(
+                MsgBoxBean(
+                    MsgBoxType.OPERATION,
+                    OperationMsg(
+                        System.currentTimeMillis(), "请尽快操作车辆至适当位置掉头！", -1
+                    )
+                )
+            )
+            SoundPoolHelper.getSoundPoolHelper().playSoundWithRedId(ActivityUtils.getTopActivity(), R.raw.startautopilot)
+        }  else if ("EMAP_ATTITUDE_INIT_FAILED" == guardianInfo.getCode()) {
             // 收到ssm的自动驾驶变为ready，再次下发轨迹下载.解决：域控重启，或者102域控启动太早，107节点初始化未完成导致的轨迹未进行下载。
             d(SceneConstant.M_CHARTER_D + TAG, "onAutopilotGuardian() ssm ready，再次发起下载")
             syncTrajectoryInfo(get().getBusOrderResult()?.lineId!!,

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/model/CharterPassengerModel.kt

@@ -53,6 +53,7 @@ import io.reactivex.Observable
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
 import mogo.telematics.pad.MessagePad
+import mogo_msg.MogoReportMsg
 import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.TimeUnit
@@ -197,6 +198,14 @@ object CharterPassengerModel {
                 d(M_BUS_P + TAG, "底盘给到站信息")
                 arriveDest()
             }
+            override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
+                super.onAutopilotGuardian(guardianInfo)
+                guardianInfo?.let {
+                    if (it.code=="IMAP_TRA_LOADED") {
+                        ToastCharterUtils.showToastShort("请等待车辆完成掉头后再出发吧～")
+                    }
+                }
+            }
         }
 
     /**

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/itinerary/ItineraryView.kt

@@ -13,6 +13,9 @@ import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance_surplus
 import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_distance_unit
 import kotlinx.android.synthetic.main.m1_itinerary_info.view.tv_speed
 
+/**
+ * 速度、剩余时间、剩余距离和到达时间
+ */
 class ItineraryView : ConstraintLayout, ItineraryViewModel.ItineraryViewCallback {
 
     private val TAG = "ItineraryView"

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/orderinfo/OrderInfoView.kt

@@ -19,6 +19,9 @@ import kotlinx.android.synthetic.main.m1_devices_fragment.view.actv_order_times
 import kotlinx.android.synthetic.main.m1_devices_fragment.view.cl_order_info
 import kotlinx.android.synthetic.main.m1_devices_fragment.view.cl_order_info_endorder_comfit
 
+/**
+ * 剩余时间和结束订单入口
+ */
 class OrderInfoView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback {
 
     private val TAG = "OrderInfoView"

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/selectline/SelectLineView.kt

@@ -41,6 +41,9 @@ import kotlinx.android.synthetic.main.m1_order_loading.view.iv_loading_wait_ent
 import me.jessyan.autosize.utils.AutoSizeUtils
 import org.greenrobot.eventbus.EventBus
 
+/**
+ * 选择线路
+ */
 class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallback {
 
     private val TAG = "OrderInfoView"

OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/softcontrol/SoftControlView.kt

@@ -72,6 +72,9 @@ import kotlinx.android.synthetic.main.m1_soft_fragment.view.tv_temperature_title
 import me.jessyan.autosize.utils.AutoSizeUtils
 import java.util.concurrent.TimeUnit
 
+/**
+ * 空调、暖风机、声音控制
+ */
 class SoftControlView : ConstraintLayout, SoftControlViewModel.SoftControlCallback {
 
     private val TAG = "OrderInfoView"

OCH/charter/passenger/src/main/res/layout/m1_main_fragment.xml

@@ -90,12 +90,14 @@
         app:layout_constraintEnd_toEndOf="@+id/viewBusPM1MsgBoxButton"
         app:layout_constraintTop_toBottomOf="@+id/viewBusPM1MsgBoxButton" />
 
+    <!--速度、剩余时间、剩余距离和到达时间-->
     <com.mogo.och.charter.passenger.ui.itinerary.ItineraryView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <!--剩余时间和结束订单入口-->
     <com.mogo.och.charter.passenger.ui.orderinfo.OrderInfoView
         android:id="@+id/biz_orderinfo"
         android:layout_width="match_parent"
@@ -105,12 +107,14 @@
         app:layout_constraintBottom_toTopOf="@+id/bb_boorombar"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <!--空调、暖风机、声音控制-->
     <com.mogo.och.charter.passenger.ui.softcontrol.SoftControlView
         android:id="@+id/biz_softcontrol"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone" />
 
+    <!--选择线路-->
     <com.mogo.och.charter.passenger.ui.selectline.SelectLineView
         android:id="@+id/biz_selectline"
         android:layout_width="0dp"
@@ -122,13 +126,14 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <!--视频播放-->
     <com.mogo.och.charter.passenger.ui.video.VideoView
         android:id="@+id/biz_video"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone" />
 
-
+    <!--底部导航栏-->
     <com.mogo.och.charter.passenger.ui.bottom.BottomBar
         android:id="@+id/bb_boorombar"
         android:layout_width="match_parent"
@@ -137,6 +142,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <!--调试面板-->
     <com.mogo.och.charter.passenger.ui.debugview.DebugView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -145,6 +151,7 @@
         app:layout_constraintEnd_toEndOf="@+id/mapBizView"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <!--锁定状态和解锁入口-->
     <com.mogo.och.charter.passenger.ui.lockview.UnlockView
         android:id="@+id/uv_only_unlock"
         android:visibility="gone"
@@ -156,6 +163,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
+    <!--锁定和解锁入口-->
     <com.mogo.och.charter.passenger.ui.lockview.LockAndUnlockView
         android:layout_width="@dimen/dp_138"
         android:layout_height="@dimen/dp_138"