[5.0.0]

[选择线路]

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

@@ -160,9 +160,10 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         }
         if (visibility == View.GONE || visibility == View.INVISIBLE) {
             EventBus.getDefault().post(EventLineSites(null, null, true))
-            viewModel?.addMsgListener()
-        } else {
             viewModel?.removeMsgListener()
+        } else {
+            viewModel?.addMsgListener()
+            viewModel?.initData()
         }
     }
 
@@ -184,6 +185,12 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         }
     }
 
+    /**
+     * @param showBiz  展示线路和站点
+     * @param showNetError 网络错误页面
+     * @param showNorOrder 没有网络请求
+     * @param showLoading  登录司机端回复
+     */
     override fun setVisableByTrun(
         showBiz: Boolean,
         showNetError: Boolean,
@@ -223,6 +230,9 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         }
     }
 
+    /**
+     * 司机同意所选线路
+     */
     override fun hideDataDriverAgree() {
         group_driver_agrenn_line?.visibility = View.VISIBLE
         aciv_driver_refuse_group?.visibility = View.GONE
@@ -235,6 +245,9 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         }
     }
 
+    /**
+     * 显示确认和取消按钮
+     */
     override fun setEnableSiteStatus(cancleAndSubmit: Boolean) {
         if (cancleAndSubmit) {
             g_side_cancle_submit_group?.visibility = View.VISIBLE
@@ -247,6 +260,12 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
         lineAdapter.submitLine(lineInfo)
     }
 
+    /**
+     * 司机拒绝请求展示的页面
+     * ① 司机拒绝
+     * ② 2分钟超时
+     * ③ 请求中和司机端断开链接
+     */
     override fun hideDataDriverRefuse() {
         group_driver_agrenn_line?.visibility = View.GONE
         aciv_driver_refuse_group?.visibility = View.VISIBLE
@@ -276,6 +295,7 @@ class SelectLineView : ConstraintLayout, SelectLineViewModel.SelectLineViewCallb
 
     private fun setViewGone() {
         goneViewListener?.goneAllView()
+        showSelectData()
     }
 
     init {

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

@@ -116,7 +116,6 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
 
     init {
         CharterPassengerModel.setStatusChangeListener(TAG, this)
-
     }
 
     override fun onCleared() {
@@ -125,7 +124,6 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
         RxUtils.disposeSubscribe(subscribeSelectSite)
         BizLoopManager.removeLoopFunction(TAGLINELOOP)
         CharterPassengerModel.setStatusChangeListener(TAG, null)
-
     }
 
     fun addMsgListener() {
@@ -147,6 +145,10 @@ class SelectLineViewModel : ViewModel(), IOrderStatusChangeListener {
 
     fun setVIewCallback(viewCallback: SelectLineViewCallback) {
         this.viewCallback = viewCallback
+        initData()
+    }
+
+    fun initData(){
         val currentOrderStatus = CharterPassengerModel.getCurrentOrderStatus()
         needRunUI(currentOrderStatus)
         extracted()