Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0

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

@@ -21,6 +21,7 @@ import com.mogo.och.bus.passenger.ui.adapter.OrderSiteItemAdapter
 import com.mogo.och.bus.passenger.ui.dialogfragment.M1ContainFragment
 import com.mogo.och.bus.passenger.view.BottomDecoration
 import com.mogo.och.common.module.utils.RxUtils
+import io.reactivex.disposables.Disposable
 import kotlinx.android.synthetic.main.m1_order_fragment.*
 import me.jessyan.autosize.utils.AutoSizeUtils
 
@@ -40,6 +41,9 @@ class M1OrderLineFragment :
     val lineList = mutableListOf<LineInfoResponse.LineInfo>()
     val siteList = mutableListOf<SiteInfoResponse.SiteInfo>()
 
+    private var subscribeDirverAgree: Disposable? = null
+    private var subscribeDirverRefuse: Disposable? = null
+
 
     override fun getLayoutId(): Int {
         return R.layout.m1_order_fragment
@@ -78,7 +82,7 @@ class M1OrderLineFragment :
     private fun initListener() {
         lineAdapter.checkChangeListener = object : OrderLineItemAdapter.CheckListener {
             override fun canSwitchLine(): Boolean {
-                return mPresenter?.canSwitchLine()?:true
+                return true
             }
 
             override fun onCheckListener(lineInfo: LineInfoResponse.LineInfo) {
@@ -133,10 +137,10 @@ class M1OrderLineFragment :
 
     fun showSelectData() {
         UiThreadHandler.post {
-            g_lines_sites_data.visibility = View.VISIBLE
-            g_loading_group.visibility = View.GONE
-            group_driver_agrenn_line.visibility = View.GONE
-            aciv_driver_refuse_group.visibility = View.GONE
+            g_lines_sites_data?.visibility = View.VISIBLE
+            g_loading_group?.visibility = View.GONE
+            group_driver_agrenn_line?.visibility = View.GONE
+            aciv_driver_refuse_group?.visibility = View.GONE
         }
     }
 
@@ -145,7 +149,7 @@ class M1OrderLineFragment :
         aciv_driver_refuse_group.visibility = View.GONE
         g_loading_group.visibility = View.GONE
         g_lines_sites_data.visibility = View.GONE
-        RxUtils.createSubscribe(3_000) {
+        subscribeDirverAgree = RxUtils.createSubscribe(3_000) {
             dismiss?.closeDialog()
         }
     }
@@ -154,7 +158,7 @@ class M1OrderLineFragment :
         aciv_driver_refuse_group.visibility = View.VISIBLE
         g_loading_group.visibility = View.GONE
         g_lines_sites_data.visibility = View.GONE
-        RxUtils.createSubscribe(3_000) {
+        subscribeDirverRefuse = RxUtils.createSubscribe(3_000) {
             showSelectData()
         }
     }
@@ -194,6 +198,8 @@ class M1OrderLineFragment :
         super.onDestroyView()
         //loadingAni.cancel()
         CallerLogger.d(SceneConstant.M_BUS_P + TAG, "onDestroyView")
+        RxUtils.disposeSubscribe(subscribeDirverAgree)
+        RxUtils.disposeSubscribe(subscribeDirverRefuse)
     }
 
     fun lineAdapterSubmit(lineInfo: LineInfoResponse.LineInfo) {

OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_datetime.xml

@@ -12,6 +12,11 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/viewTextClock"
+        android:textSize="@dimen/dp_22"
+        android:gravity="center"
+        android:textColor="@color/bus_p_m1_1b2546"
+        android:textStyle="bold"
+        android:layout_marginEnd="@dimen/dp_32"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/dp_47"/>
 

build.gradle

@@ -146,3 +146,12 @@ boolean isAndroidTestBuild() {
     }
     return false
 }
+
+boolean isReleaseBuild() {
+    for (String s : gradle.startParameter.taskNames) {
+        if (s.contains("Release") | s.contains("release")) {
+            return true
+        }
+    }
+    return false
+}

gradle/bytex/bytex.gradle

@@ -14,3 +14,4 @@ apply from: rootProject.file('gradle/bytex/bytex_thread_opt.gradle')
 apply from: rootProject.file('gradle/bytex/bytex_lancetx.gradle')
 apply from: rootProject.file('gradle/bytex/bytex_apm.gradle')
 apply from: rootProject.file('gradle/bytex/bytex_systrace.gradle')
+apply from: rootProject.file('gradle/bytex/bytex_matrix.gradle')

gradle/bytex/bytex_matrix.gradle

@@ -0,0 +1,13 @@
+if (!rootProject.isReleaseBuild()) {
+    apply plugin: 'bytex.matrix'
+
+    matrix {
+        trace {
+            enable = true    //if you don't want to use trace canary, set false
+            baseMethodMapFile = "${project.buildDir}/matrix_output/customMethodMapping.txt"
+            blackListFile = "${project.projectDir}/matrixTrace/blackMethodList.txt"
+        }
+        logLevel = "D"
+    }
+}
+