From 0ef58f53550f0f8591eb38e213df70b996896b3e Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 15 May 2023 14:43:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[charter]=20[3.2.0]=20[=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E7=8A=B6=E6=80=81=E3=80=81=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E7=BA=BF=E8=B7=AF=E4=B8=8D=E8=83=BD=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E7=BA=BF=E8=B7=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/dialogfragment/fragment/M1OrderLineFragment.kt | 2 +- .../src/main/res/layout/m1_statusview_datetime.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt index 1e5ce2e39c..de5b0d4fdb 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt @@ -78,7 +78,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) { diff --git a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_datetime.xml b/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_datetime.xml index 69cbbc6e28..6497e7b629 100644 --- a/OCH/mogo-och-charter-passenger/src/main/res/layout/m1_statusview_datetime.xml +++ b/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"/> From fbd18189085de38d24938796260a3b2009714bd3 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Mon, 15 May 2023 14:58:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[3.2.0][Opt]=E6=89=93=E5=BC=80matrix?= =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 9 +++++++++ gradle/bytex/bytex.gradle | 1 + gradle/bytex/bytex_matrix.gradle | 13 +++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 gradle/bytex/bytex_matrix.gradle diff --git a/build.gradle b/build.gradle index b1d76c9bc8..c4e616ce7b 100644 --- a/build.gradle +++ b/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 +} diff --git a/gradle/bytex/bytex.gradle b/gradle/bytex/bytex.gradle index 7a043453bc..cb27905070 100644 --- a/gradle/bytex/bytex.gradle +++ b/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') diff --git a/gradle/bytex/bytex_matrix.gradle b/gradle/bytex/bytex_matrix.gradle new file mode 100644 index 0000000000..3ed5443090 --- /dev/null +++ b/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" + } +} + From 14750383bef6dcc22eca7573a8c76f17384bb9a5 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 15 May 2023 15:21:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[charter]=20[3.2.0]=20[=E5=BB=B6=E6=97=B6?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=9C=80=E8=A6=81=E8=AE=BE=E7=BD=AE=E5=8F=96?= =?UTF-8?q?=E6=B6=88]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fragment/M1OrderLineFragment.kt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt index de5b0d4fdb..140eb2ef76 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt +++ b/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() val siteList = mutableListOf() + private var subscribeDirverAgree: Disposable? = null + private var subscribeDirverRefuse: Disposable? = null + override fun getLayoutId(): Int { return R.layout.m1_order_fragment @@ -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) {