[6.0.0] 剩余里程和时间处理

OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/model/TaxiModel.kt

@@ -731,7 +731,13 @@ object TaxiModel {
 
             })
     }
-
+    fun setArriveAtVirtualStation() {
+        if (mUntruthTask == null) {
+            ToastUtils.showShort("订单状态不匹配该操作！")
+            return
+        }
+        arriveSite(mUntruthTask!!.siteId, false)
+    }
     /**
      * 订单流转debug START
      */

OCH/taxi/mogo-och-taxi-unmanned/src/main/java/com/mogo/och/taxi/ui/TaxiBeingTaskFragment.kt

@@ -197,7 +197,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
             && mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.StartTask.code){
 
             startNaviToStation(isVoicePlay,mCurrentTaskAndOrder!!.endSite!!.gcjLat,
-                mCurrentTaskAndOrder!!.endSite!!.gcjLat)
+                mCurrentTaskAndOrder!!.endSite!!.gcjLon)
             return
         }
 
@@ -205,7 +205,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
             && mCurrentTaskAndOrder!!.currentStatus == TaskStatusEnum.GetTask.code){ //演练任务和送驾任务
 
             startNaviToStation(isVoicePlay,mCurrentTaskAndOrder!!.startSite!!.gcjLat,
-                mCurrentTaskAndOrder!!.startSite!!.gcjLat)
+                mCurrentTaskAndOrder!!.startSite!!.gcjLon)
         }
     }
 
@@ -512,7 +512,7 @@ class TaxiBeingTaskFragment : BaseFragment(),
     @RequiresApi(Build.VERSION_CODES.N)
     fun updateDistanceAndTime(meters: Long, timeInSecond: Long) {
 //        CallerLogger.INSTANCE.d(M_TAXI + TAG,"meters = "+meters+"timeInSecond ="+timeInSecond);
-        if (mCurrentTaskAndOrder == null || mCurrentTaskAndOrder!!.order == null) return
+        if (mCurrentTaskAndOrder == null || mCurrentTaskAndOrder!!.endSite == null) return
         var dis = "0"
         var disUnit = "公里"
         if (meters > 0) {
@@ -528,6 +528,8 @@ class TaxiBeingTaskFragment : BaseFragment(),
         val strHtml2 =
             ("<font color=\"#CAD6FF\">里程 </font>" + "<b><font color=\"#FFFFFF\">" + dis + "</font></b>" + "<font color=\"#CAD6FF\"> " + disUnit + "</font>"
                     + "<font color=\"#CAD6FF\">，剩余 </font>" + "<b><font color=\"#FFFFFF\">" + min + "</font></b>" + "<font color=\"#CAD6FF\"> 分钟</font>")
+
+        taskOtherInfo.text = Html.fromHtml(strHtml2,Html.FROM_HTML_MODE_LEGACY)
     }
 
     private fun speekVoice200mTipsOnce() {

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

@@ -197,6 +197,9 @@ class TaxiFragment : BaseTaxiTabFragment<TaxiFragment, TaxiPresenter>(),
      * 订单流转debug START
      */
     private fun initOrderTestBar() {
+        findViewById<View>(R.id.test_bar_to_virtual)?.setOnClickListener{
+            TaxiModel.setArriveAtVirtualStation()
+        }
         findViewById<View>(R.id.test_bar_to_start)?.setOnClickListener {
             TaxiModel.setArriveAtStartStation()
         }

OCH/taxi/mogo-och-taxi-unmanned/src/main/res/layout/taxi_panel.xml

@@ -66,6 +66,13 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/dp_24" />
 
+        <Button
+            android:id="@+id/test_bar_to_virtual"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="到达标定站点"
+            android:textSize="@dimen/dp_24" />
+
         <Button
             android:id="@+id/test_bar_to_start"
             android:layout_width="wrap_content"