[6.7.0]

[fea]
[slide 抽离]

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

@@ -10,15 +10,13 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.mogo.commons.AbsMogoApplication
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
-import com.mogo.eagle.core.utilcode.mogo.view.SpacesItemDecoration
 import com.mogo.och.common.module.manager.autopilot.line.LineManager
 import com.mogo.och.common.module.utils.ResourcesUtils
 import com.mogo.och.common.module.wigets.CommonDialogStatus
-import com.mogo.och.common.module.wigets.OCHCommitDialog
+import com.mogo.och.common.module.wigets.CommonSlideView
 import com.mogo.och.shuttle.weaknet.R
 import com.mogo.och.weaknet.model.LineModel
 import com.mogo.och.weaknet.ui.bizswitch.SwtichBizeModel
-import com.mogo.och.weaknet.view.BizLeaveStationView.SlideListener
 import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.aciv_task_leave_station_slide_bg
 import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.actv_arriver_station
 import kotlinx.android.synthetic.main.shuttle_weak_task_running.view.actv_complete_task
@@ -63,7 +61,7 @@ class TaskRunningView: ConstraintLayout, TaskRunningModel.SwtichLineViewCallback
         rl_running_task_station_list.setLayoutManager(linearLayoutManager)
         mAdapter = TaskRunningAdapter(context, mutableListOf())
         rl_running_task_station_list.setAdapter(mAdapter)
-        aciv_task_leave_station_slide_bg.setSlideListener(object : SlideListener{
+        aciv_task_leave_station_slide_bg.setSlideListener(object : CommonSlideView.SlideListener {
             override fun slideEnd() {
                 viewModel?.leaveStation()
             }

OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/view/BizMapView.kt

@@ -1,63 +0,0 @@
-package com.mogo.och.weaknet.view
-
-import android.content.Context
-import android.os.Bundle
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.widget.FrameLayout
-import com.mogo.eagle.core.data.config.FunctionBuildConfig
-import com.mogo.eagle.core.function.view.MapBizView
-import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
-import com.mogo.map.uicontroller.IMogoMapUIController
-import com.mogo.och.shuttle.weaknet.R
-
-/**
- * 魔戒蓝牙控件
- * 放置于StatusBar右侧位置
- */
-class BizMapView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : FrameLayout(context, attrs, defStyleAttr) {
-
-    private lateinit var mapBizView: MapBizView
-
-    init {
-        if (AppIdentityModeUtils.isB2(FunctionBuildConfig.appIdentityMode)) {
-            LayoutInflater.from(context).inflate(R.layout.shuttle_weak_m2_bizmap_map, this, true)
-        }else if(AppIdentityModeUtils.isB1(FunctionBuildConfig.appIdentityMode)){
-            LayoutInflater.from(context).inflate(R.layout.shuttle_weak_jl_bizmap_map, this, true)
-        }else{
-            LayoutInflater.from(context).inflate(R.layout.shuttle_weak_jl_bizmap_map, this, true)
-        }
-        mapBizView = findViewById(R.id.bizMapView)
-    }
-
-    fun getUI(): IMogoMapUIController? {
-        return mapBizView.getUI()
-    }
-
-    fun onCreate(bundle: Bundle?) {
-        mapBizView.onCreate(bundle)
-    }
-    fun onResume() {
-        mapBizView.onResume()
-    }
-
-    fun onSaveInstanceState(outState: Bundle){
-        mapBizView.onSaveInstanceState(outState)
-    }
-
-    fun onLowMemory() {
-        mapBizView.onLowMemory()
-    }
-
-    fun onPause() {
-        mapBizView.onPause()
-    }
-
-    fun onDestroy() {
-        mapBizView.onDestroy()
-    }
-}

OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_leave_station_view.xml

@@ -7,15 +7,6 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
 
-<!--    <androidx.appcompat.widget.AppCompatImageView-->
-<!--        android:id="@+id/aciv_task_leave_station_slide_bg"-->
-<!--        app:layout_constraintBottom_toBottomOf="parent"-->
-<!--        app:layout_constraintStart_toStartOf="parent"-->
-<!--        app:layout_constraintEnd_toEndOf="parent"-->
-<!--        android:src="@drawable/bus_task_leave_station_slide_bg"-->
-<!--        android:layout_width="@dimen/dp_774"-->
-<!--        android:layout_height="@dimen/dp_120"/>-->
-
     <com.airbnb.lottie.LottieAnimationView
         android:id="@+id/lottie_bg"
         android:layout_width="774px"

OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_task_running.xml

@@ -57,11 +57,13 @@
         android:layout_marginTop="@dimen/dp_22"
         android:layout_marginBottom="@dimen/dp_46"/>
 
-    <com.mogo.och.weaknet.view.BizLeaveStationView
+    <com.mogo.och.common.module.wigets.CommonSlideView
         android:id="@+id/aciv_task_leave_station_slide_bg"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:assetsfolder="images"
+        app:slide_title="@string/bus_task_leave_station"
         android:layout_marginBottom="@dimen/dp_46"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>