[8.1.0]

[fix]
[UI变更]

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/ui/taskrunning/TaskRunningAdapter.kt

@@ -39,6 +39,7 @@ class TaskRunningAdapter(
     private var totalHeight = 0f
 
     fun setDataList(dataList: List<BusStationBean>) {
+        CallerLogger.d(TAG,"设置view-----")
         this.mData.clear()
         this.mData.addAll(dataList)
         if (LineModel.startStationIndex == 0) {
@@ -47,7 +48,7 @@ class TaskRunningAdapter(
             totalHeight =
                 (halfHeight + (dataList.size - 1 - LineModel.startStationIndex) * heightItem).toFloat()
         }
-        notifyItemRangeChanged(0, dataList.size, true)
+        notifyDataSetChanged()
     }
 
     override fun onCreateViewHolder(

OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/arrive/ArrivedView.kt

@@ -4,8 +4,10 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.animation.ValueAnimator
 import android.content.Context
+import android.graphics.drawable.AnimationDrawable
 import android.util.AttributeSet
 import android.view.LayoutInflater
+import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -17,6 +19,7 @@ import kotlinx.android.synthetic.main.m2_arrive_view.view.aciv_arrow_left
 import kotlinx.android.synthetic.main.m2_arrive_view.view.aciv_arrow_right
 import kotlinx.android.synthetic.main.m2_arrive_view.view.aciv_door_left
 import kotlinx.android.synthetic.main.m2_arrive_view.view.aciv_door_right
+import kotlinx.android.synthetic.main.m2_arrive_view.view.iv_animal_list
 import kotlinx.android.synthetic.main.m2_arrive_view.view.ochtv_arrive_station_value
 import me.jessyan.autosize.utils.AutoSizeUtils
 
@@ -95,6 +98,9 @@ class ArrivedView : ConstraintLayout {
             if(!animator.isRunning){
                 animator.start()
             }
+            iv_animal_list.visibility = View.VISIBLE
+            val animationDrawable = iv_animal_list.drawable as AnimationDrawable
+            animationDrawable.start()
         }else{
             animator.cancel()
             val paramsLeft = aciv_door_left.layoutParams as LayoutParams
@@ -108,6 +114,10 @@ class ArrivedView : ConstraintLayout {
             aciv_arrow_left.visibility = GONE
             aciv_arrow_right.visibility = GONE
             animatorArrow.cancel()
+
+            iv_animal_list.visibility = View.VISIBLE
+            val animationDrawable = iv_animal_list.drawable as AnimationDrawable
+            animationDrawable.stop()
         }
     }
 

OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/line/lineinfo/LineView.kt

@@ -49,9 +49,7 @@ class LineView : ConstraintLayout, LineViewModel.LineViewCallback {
 //                AutoSizeUtils.dp2px(context,20f)
 //            )
 //        )
-        autoplit_info.onClick {
+
-            updateRemainMt("12公里","25分钟")
-        }
         ll_station_container.setAdapter(mAdapter)
 
         ll_station_container.itemAnimator?.addDuration = 0;

OCH/shuttle/passenger_weaknet/src/main/java/b2/com/mogo/och/shuttle/weaknet/passenger/ui/statusbar/M2StatusBarView.kt

@@ -76,19 +76,13 @@ class M2StatusBarView @JvmOverloads constructor(
         tv_power_cos?.also {
             it.text = "?"
         }
-        iv_logon.onClick {
+
-            BizLoopManager.runInMainThread{
-                BleManager.scanLeDevice()
-            }
-        }
         tv_power_cos.onClick {
             BizLoopManager.runInIoThread {
                 BleManager.sendData2Wx("1889480", "00,${System.currentTimeMillis()}")
             }
         }
-        tv_status_line_name.onClick {
+
-            updateLineInfo("线路名称")
-        }
     }
 
     override fun updateLineInfo(lineName: String?) {

OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_line_view.xml

@@ -12,6 +12,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        android:clickable="false"
         app:layout_constraintEnd_toStartOf="@+id/autoplit_info"
         android:layout_marginEnd="@dimen/dp_41"
         android:layout_width="0dp"

OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_end_view.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:background="@color/b2_95B1D6"
+    android:clickable="false"
     android:layout_width="match_parent"
     android:layout_height="@dimen/dp_68"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">

OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_start_view.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:background="@color/b2_95B1D6"
+    android:clickable="false"
     android:layout_width="match_parent"
     android:layout_height="@dimen/dp_68"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">

OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_current_view.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:background="@color/b2_95B1D6"
     android:layout_width="match_parent"
+    android:clickable="false"
     android:layout_height="@dimen/dp_68"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 

OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_end_view.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
+    android:clickable="false"
     android:layout_width="match_parent"
     android:layout_height="@dimen/dp_68">
 

OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_future_view.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
+    android:clickable="false"
     android:layout_width="match_parent"
     android:layout_height="@dimen/dp_68">
 

OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_pass_view.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
+    android:clickable="false"
     android:layout_width="match_parent"
     android:layout_height="@dimen/dp_68">
 

OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_normal_start_view.xml

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
     android:layout_width="match_parent"
+    android:clickable="false"
     android:layout_height="@dimen/dp_68">
 
     <View

OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_omit_view_future.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
+    android:clickable="false"
     android:layout_width="match_parent"
     android:layout_height="@dimen/dp_68">
 

OCH/shuttle/passenger_weaknet/src/main/res/b2/layout/m2_station_omit_view_pass.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
+    android:clickable="false"
     android:layout_width="match_parent"
     android:layout_height="@dimen/dp_68">