From 0ef58f53550f0f8591eb38e213df70b996896b3e Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 15 May 2023 14:43:23 +0800 Subject: [PATCH] =?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"/>