[8.0.0]

[fea]
[添加距离排序、刷新]

OCH/common/biz/src/main/java/com/mogo/och/biz/routing/bean/RoutingBean.kt

@@ -17,7 +17,8 @@ data class GrayLineBean(
     var lineFailCount: Int?, //线路累计反馈不可用次数
     var isChoosed: Boolean = false, //当前是否选中
     var startSite: RoutingSite?,
-    var endSite: RoutingSite?
+    var endSite: RoutingSite?,
+    var distance:Float,
 )
 
 /**

OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectModel.kt

@@ -16,9 +16,8 @@ import com.mogo.och.biz.routing.bean.StartGrayAndQueryContrailRsp
 import com.mogo.och.biz.routing.net.RoutingServiceManager
 import com.mogo.och.bridge.autopilot.line.LineManager
 import com.mogo.och.common.module.network.OchCommonServiceCallback
-import com.mogo.och.data.bean.BusStationBean
 import com.mogo.och.data.bean.LineInfo
-import com.mogo.och.biz.routing.ui.runing.taxi.TaxiRunningModel
+import com.mogo.och.common.module.biz.birdge.BridgeManager
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
 
 /**
@@ -58,6 +57,12 @@ class RoutingSelectModel : ViewModel() {
                     data.data?.also {
                         result.addAll(it)
                     }
+                    result.forEach {
+                        it.startSite?.let { startSite->
+                            it.distance = BridgeManager.distance2Point( startSite.gcjLon, startSite.gcjLat,)
+                        }
+                    }
+                    result.sortBy { it.distance }
                     viewCallback?.onQueryRoutingGrayLineListSuccess(result)
                 }
 

OCH/common/biz/src/main/java/com/mogo/och/biz/routing/ui/routingselect/RoutingSelectView.kt

@@ -7,6 +7,7 @@ import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.findViewTreeViewModelStoreOwner
+import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.och.biz.R
@@ -16,6 +17,7 @@ import com.mogo.och.common.module.wigets.WrapContentLinearLayoutManager
 import com.mogo.och.biz.routing.ui.RoutingSwitchModel
 import com.mogo.och.biz.routing.ui.routingselect.RoutingSelectModel.SwtichRoutingViewCallback
 import com.mogo.och.common.module.manager.logchainanalytic.OchChainLogManager
+import kotlinx.android.synthetic.main.biz_taxi_select.view.actv_refresh
 import kotlinx.android.synthetic.main.biz_taxi_select.view.include_empty
 import kotlinx.android.synthetic.main.biz_taxi_select.view.include_error
 import kotlinx.android.synthetic.main.biz_taxi_select.view.switch_routing_rv
@@ -72,6 +74,10 @@ class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback {
                 viewModel?.startGrayTaskAndQueryRoutingContrail(data.contrailId!!,data)
             }
         })
+
+        actv_refresh.onClick {
+            viewModel?.queryRoutingGrayLineList()
+        }
     }
 
     private fun showEmptyView() {
@@ -99,6 +105,7 @@ class RoutingSelectView: ConstraintLayout, SwtichRoutingViewCallback {
             mRoutingLineList.clear()
             mRoutingLineList.addAll(data)
             mChooseLineListAdapter.notifyDataSetChanged()
+            ToastUtils.showShort("刷新成功")
         } else {
             showEmptyView()
         }

OCH/common/biz/src/main/res/routing/layout/biz_other_running.xml

@@ -41,7 +41,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         android:layout_marginTop="@dimen/dp_2"
-        tools:text="往新街口方向"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/dp_100">
         <androidx.appcompat.widget.AppCompatTextView

OCH/common/biz/src/main/res/routing/layout/biz_taxi_select.xml

@@ -20,6 +20,28 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
+    <LinearLayout
+        android:id="@+id/actv_running_task_time"
+        android:gravity="center"
+        android:layout_marginEnd="@dimen/dp_54"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginTop="@dimen/dp_2"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_100">
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/actv_refresh"
+            android:layout_width="@dimen/dp_200"
+            android:layout_height="@dimen/dp_80"
+            app:pressed_enabled="false"
+            android:gravity="center"
+            android:text="刷新列表"
+            android:background="@drawable/biz_button_selector"
+            android:textColor="@color/white"
+            android:textSize="@dimen/dp_40" />
+
+    </LinearLayout>
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/switch_routing_rv"
         android:layout_width="match_parent"

OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/bizswitch/SwitchBizView.kt

@@ -59,4 +59,11 @@ class SwitchBizView: WindowRelativeLayout, SwtichBizeModel.SwtichLineViewCallbac
         }
     }
 
+    override fun onDetachedFromWindow() {
+        RoutingManager.getRoutingView()?.let {
+            routingSwitchView.removeView(it)
+        }
+        super.onDetachedFromWindow()
+    }
+
 }