选择线路和到站冲突

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt

@@ -211,6 +211,9 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) :
                         ) as ChangeDestMsg
                         CallerLogger.d(M_BUS_P + BaseDPMsg.TAG, "接受数据：切换站点${msg}")
                         if (msg.isConfirmed) {
+                            if(msg.arriveStatus==2){
+                                return@post
+                            }
                             ToastCharterUtils.showShort("站点确定")
                             mView?.setEnableSiteStatus(true)
                             checkLine = tempCheckLine

OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1SoftFragment.kt

@@ -107,12 +107,14 @@ class M1SoftFragment :
 
     private fun setAirConditionAni() {
         dbv_wind.post {
-            val measuredHeight = dbv_wind.measuredHeight
-            animator1 = ObjectAnimator.ofInt(dbv_wind, "showHeight", 0, measuredHeight).apply {
-                duration = 1000
-                repeatCount = ValueAnimator.INFINITE
-                if(rg_setting_windspeed.checkedRadioButtonId!=0&&tv_aircondition_switch.isChecked){
-                    start()
+            dbv_wind?.let {
+                val measuredHeight = it.measuredHeight
+                animator1 = ObjectAnimator.ofInt(it, "showHeight", 0, measuredHeight).apply {
+                    duration = 1000
+                    repeatCount = ValueAnimator.INFINITE
+                    if(rg_setting_windspeed.checkedRadioButtonId!=0&&tv_aircondition_switch.isChecked){
+                        start()
+                    }
                 }
             }
         }