[6.7.0]

[fea]
[ui修改]

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiTaskModel.kt

@@ -625,7 +625,7 @@ object TaxiTaskModel {
                     DebugView.printInfoMsg("[上报ArriveSite] success siteId=$siteId, isArriveAtEndSite=$isArriveAtEndSite")
                     d(TAG, "submitArriveSite-onSuccess data=" + GsonUtil.jsonFromObject(data))
                     mDriveToNearestStationTask = null
-                    LineManager.setLineInfo(null);
+                    LineManager.setLineInfo(null)
                     if (isArrivedNearestStation) {// 播报提醒
                         VoiceNotice.showNotice("已到达出车点")
                     }
@@ -807,7 +807,7 @@ object TaxiTaskModel {
                             d(TAG, "queryCurrentTaskOnce ArriveAtEnd")
 
                             //订单到站结束轨迹剩余里程就算和高德计算, 防止到站查询订单全程的显示被覆盖
-                            LineManager.setLineInfo(null);
+                            LineManager.setLineInfo(null)
                             TrajectoryAndDistanceManager.setStationPoint(null, null, -1L)
                             destroyAmapNavi()
 
@@ -882,7 +882,7 @@ object TaxiTaskModel {
         if (mDriveToNearestStationTask == null){
             destroyAmapNavi()
         }
-        LineManager.setLineInfo(null);
+        LineManager.setLineInfo(null)
         TrajectoryAndDistanceManager.setStationPoint(null, null, -1L)
     }
 
@@ -1228,7 +1228,7 @@ object TaxiTaskModel {
             return
         }
 
-        OchAutopilotAnalytics.triggerClickStartAutopilotTime(System.currentTimeMillis());
+        OchAutopilotAnalytics.triggerClickStartAutopilotTime(System.currentTimeMillis())
 
         DebugView.printInfoMsg("[启自驾] startAutoPilot")
         if (!checkCurrentTaskCondition()) {
@@ -1291,9 +1291,9 @@ object TaxiTaskModel {
                 resion = OchAutoPilotManager.canStartAutoPilotByDistance(it.lineId)
             }
             if(!StringUtils.isEmpty(resion)){
-                ToastUtils.showShort(resion);
-                VoiceNotice.showNotice(resion);
-                return;
+                ToastUtils.showShort(resion)
+                VoiceNotice.showNotice(resion)
+                return
             }
         }
         // 4、ssm 给出数据
@@ -1319,7 +1319,7 @@ object TaxiTaskModel {
             return
         }
 
-        val sessionId = OchAutoPilotManager.startAutoPilot(parameters);
+        val sessionId = OchAutoPilotManager.startAutoPilot(parameters)
         DebugView.printInfoMsg("[启自驾] 调用成功")
         d(
             TAG, "start autopilot with parameter: %s",
@@ -1513,7 +1513,7 @@ object TaxiTaskModel {
         mCurrentTaskWithOrder = null
         mDriveToNearestStationTask = null
         DebugView.printInfoMsg("[登出] 退出登陆")
-        LineManager.setLineInfo(null);
+        LineManager.setLineInfo(null)
         MogoStatusManager.getInstance().setTaxiUnmanedDriverPerformTask(TAG, false)
         MogoStatusManager.getInstance().setTaxiUnmanedDriverTakingOrders(TAG, false)
         MogoStatusManager.getInstance().setTaxiUnmanedDriverLineRoutingPerformTask(TAG, false)

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerayswitch/ItinerarySwitchModel.kt

@@ -1,6 +1,7 @@
-package com.mogo.och.unmanned.taxi.ui.task
+package com.mogo.och.unmanned.taxi.ui.task.itinerayswitch
 
 import androidx.lifecycle.ViewModel
+import com.mogo.och.unmanned.taxi.ui.task.TaxiTaskModel
 
 /**
  * @author XuXinChao

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerayswitch/ItinerarySwitchView.kt

@@ -1,4 +1,4 @@
-package com.mogo.och.unmanned.taxi.ui.task
+package com.mogo.och.unmanned.taxi.ui.task.itinerayswitch
 
 import android.content.Context
 import android.util.AttributeSet
@@ -10,11 +10,8 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
 import com.mogo.commons.module.status.MogoStatusManager
 import com.mogo.eagle.core.utilcode.kotlin.onClick
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
-import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.common.module.utils.FlowBus
-import com.mogo.och.common.module.utils.ResourcesUtils
 import com.mogo.och.unmanned.taxi.R
 import com.mogo.och.unmanned.taxi.TaxiUnmannedDriverProvider
 import com.mogo.och.unmanned.taxi.constant.TaxiDriverEventConst

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

@@ -16,7 +16,10 @@
         android:textColor="@color/white"
         android:textSize="@dimen/dp_40"
         tools:text="灰度路线11111111"
-        android:layout_width="wrap_content"
+        android:singleLine="true"
+        android:ellipsize="end"
+        app:layout_constraintEnd_toStartOf="@+id/actv_today_verify_num"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"/>
 
     <androidx.appcompat.widget.AppCompatTextView

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

@@ -36,7 +36,7 @@
         android:layout_width="@dimen/dp_856"
         android:layout_height="@dimen/dp_100"/>
 
-    <com.mogo.och.unmanned.taxi.ui.task.ItinerarySwitchView
+    <com.mogo.och.unmanned.taxi.ui.task.itinerayswitch.ItinerarySwitchView
         android:id="@+id/itinerarySwitchView"
         app:layout_constraintTop_toTopOf="@+id/guideline_h_top"
         app:layout_constraintStart_toStartOf="@+id/guideline_v_left"