From b6c8ad491ede63c3673d23338ea071c344b6b72b Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 7 Sep 2022 16:27:31 +0800 Subject: [PATCH 1/9] =?UTF-8?q?[2.10.0]taxi=E5=8F=B8=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E9=87=8D=E5=90=AF=E5=90=8E=E6=92=AD=E6=8A=A5=E9=87=8C=E7=A8=8B?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/taxi/model/TaxiModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 0b5a063e82..d073bbc7c5 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -1335,9 +1335,9 @@ public class TaxiModel { private void reportTotalDisAndTime() { float lastSumLength = CoordinateCalculateRouteUtil.calculateRouteSumLength(mRoutePoints); double lastTime = lastSumLength / TaxiConst.TAXI_AVERAGE_SPEED * 3.6; //秒 - if (mOrderStatusCallback != null) { - mOrderStatusCallback.onCurrentOrderDistToEndChanged((long) lastSumLength, (long) lastTime); - } +// if (mOrderStatusCallback != null) { +// mOrderStatusCallback.onCurrentOrderDistToEndChanged((long) lastSumLength, (long) lastTime); +// } reportOrderRemain((long) lastSumLength, (long) lastTime); } From 5c3669b8ddb1bde8dc4fa9a90361cc1ab1497e23 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 7 Sep 2022 19:07:02 +0800 Subject: [PATCH 2/9] =?UTF-8?q?[=E7=BA=BF=E7=A8=8B=E4=BC=98=E5=8C=96]?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [状态栏]优化GPS使能状态 --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e4c22b5d5d..b6ad0b3f3e 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ apply from: "javadoc.gradle" buildscript { repositories { + mavenLocal() maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' } maven { url "https://artifact.bytedance.com/repository/byteX/" } maven { url 'http://nexus.zhidaoauto.com/repository/maven-releases/' } @@ -32,7 +33,7 @@ buildscript { classpath "com.bytedance.android.byteX:base-plugin:0.3.0" classpath "com.mogo.cloud:hook:${HOOK_LOG_VERSION}" classpath 'com.volcengine:apm_insight_plugin:1.4.1' - classpath 'com.mogo.thread.opt:plg:2.2.0' + classpath 'com.mogo.thread.opt:plg:2.2.4' classpath 'com.mogo.cloud:systrace:1.0.1' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' classpath 'com.mogo.sticky:service:1.0.8' @@ -49,6 +50,7 @@ buildscript { allprojects { repositories { + mavenLocal() maven { url 'https://maven.aliyun.com/repository/public' } maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' } maven { url 'http://nexus.zhidaoauto.com/repository/maven-releases/' } From d283a7fef08b8f3409cc37b39cc6efe2e56f3a95 Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 8 Sep 2022 10:39:27 +0800 Subject: [PATCH 3/9] =?UTF-8?q?[CrashFix]=E4=BF=AE=E6=AD=A3android.view.Vi?= =?UTF-8?q?ewRootImpl$CalledFromWrongThreadException:=20Only=20the=20origi?= =?UTF-8?q?nal=20thread=20that=20created=20a=20view=20hierarchy=20can=20to?= =?UTF-8?q?uch=20its=20views.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 754ec01701..4bdb0a6522 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -728,7 +728,9 @@ import java.util.* WarningFloat.dismiss(tag) } Log.d("$M_HMI$TAG", "--- disableWarningV2X ---") - showingV2XTip?.takeIf { it.isShowing() }?.also { it.hide() } + lifecycleScope.launch { + showingV2XTip?.takeIf { it.isShowing() }?.also { it.hide() } + } } /** From ce0a7f288450122e07f186cd7cf44b4966e8ec5d Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 8 Sep 2022 11:15:55 +0800 Subject: [PATCH 4/9] =?UTF-8?q?[=E7=BA=BF=E7=A8=8B=E4=BC=98=E5=8C=96]?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=99=8D=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b6ad0b3f3e..9e2a5fbcb8 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ buildscript { classpath "com.bytedance.android.byteX:base-plugin:0.3.0" classpath "com.mogo.cloud:hook:${HOOK_LOG_VERSION}" classpath 'com.volcengine:apm_insight_plugin:1.4.1' - classpath 'com.mogo.thread.opt:plg:2.2.4' + classpath 'com.mogo.thread.opt:plg:2.2.2' classpath 'com.mogo.cloud:systrace:1.0.1' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' classpath 'com.mogo.sticky:service:1.0.8' From 7ca1dc1595145a28de08b6a0b2c5f1a7d40331f8 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 8 Sep 2022 11:21:52 +0800 Subject: [PATCH 5/9] =?UTF-8?q?[fix]=20=E9=98=B2=E6=AD=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=87=8D=E5=A4=8D=E5=BC=B9=E5=87=BA=E8=A2=AB=E9=94=80?= =?UTF-8?q?=E6=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/taxi/model/TaxiLoginModel.kt | 7 +++++++ .../com/mogo/och/taxi/presenter/TaxiLoginPresenter.kt | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiLoginModel.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiLoginModel.kt index be43294c32..bdef0b53fd 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiLoginModel.kt +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiLoginModel.kt @@ -40,6 +40,13 @@ object TaxiLoginModel{ .registerCarLocationChangedListener(TAG, mCarLocationChangedListener2) } + fun hasInit():Boolean{ + if(mContext==null&& iTaxiLoginCallback==null){ + return false; + } + return true + } + // 自车定位 private val mCarLocationChangedListener2 = IMogoCarLocationChangedListener2 { location -> mLongitude = location.longitude diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiLoginPresenter.kt b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiLoginPresenter.kt index fa5191bf3d..1497683ddc 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiLoginPresenter.kt +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiLoginPresenter.kt @@ -29,15 +29,18 @@ class TaxiLoginPresenter(view: TaxiLoginDialogFragment?) : private var countDownDisposable: Disposable? = null init { - TaxiLoginModel.init(AbsMogoApplication.getApp()) initListeners() } private fun initListeners() { + TaxiLoginModel.init(AbsMogoApplication.getApp()) TaxiLoginModel.setiTaxiLoginCallback(this) } fun getPhoneCode(phone:String){ + if(!TaxiLoginModel.hasInit()){ + initListeners() + } if (!RegexUtils.isMobileExact(phone)) { ToastUtils.showShort(R.string.module_och_taxi_login_phone_error) mView?.inputPhoneError() @@ -91,6 +94,9 @@ class TaxiLoginPresenter(view: TaxiLoginDialogFragment?) : } fun gotoLogin(phone: String, code: String) { + if(!TaxiLoginModel.hasInit()){ + initListeners() + } if (!RegexUtils.isMobileExact(phone)) { ToastUtils.showShort(R.string.module_och_taxi_login_phone_error) mView?.inputPhoneError() From 726d525a617c8929eb5c2be649e5547745f97608 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 8 Sep 2022 16:59:14 +0800 Subject: [PATCH 6/9] =?UTF-8?q?[2.10.0]bus=E5=8F=B8=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=A6=96=E6=AC=A1=E6=97=A0=E6=B3=95=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E8=87=AA=E5=8A=A8=E9=A9=BE=E9=A9=B6=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/fragment/BaseBusTabFragment.java | 17 +++++------- .../mogo/och/bus/fragment/BusFragment.java | 27 +++---------------- 2 files changed, 10 insertions(+), 34 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index 607fda1e40..bd8664c98e 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -171,6 +171,7 @@ public abstract class BaseBusTabFragment }); } initListener(); + setAutopilotBtnStatus(CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()); ctvAutopilotStatus.setOnClickListener(new OnPreventFastClickListener(){ @Override @@ -179,7 +180,6 @@ public abstract class BaseBusTabFragment } }); - setAutopilotBtnStatus(CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()); // 模拟 不可自动驾驶，目前场景是刚开机，adas还未和工控机连接 findViewById(R.id.btnAutopilotDisable).setOnClickListener(view -> debugAutoPilotStatus(IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) @@ -218,11 +218,6 @@ public abstract class BaseBusTabFragment // mBadcaseBtn的visible显示逻辑在showBadcaseEntrance内处理 mBadcaseBtn = findViewById(R.id.module_mogo_och_badcase_rl); -// CallerHmiManager.INSTANCE.registerBadCaseCallback( -// () -> { // onShow() -// return mBadcaseBtn; }, -// () -> { // onHide() -// return null; }); if (mBadcaseBtn != null) { CallerDevaToolsManager.INSTANCE.initBadCase(mBadcaseBtn); @@ -359,13 +354,13 @@ public abstract class BaseBusTabFragment ctvAutopilotStatusTv.setText(getResources().getString(R.string.bus_loading_autopilot_runnig_tv)); ctvAutopilotStatusIv.setImageResource(R.drawable.bus_disable_autopilot_icon); ctvAutopilotStatus.setSelected(false); - ctvAutopilotStatus.setFocusableInTouchMode(true); + ctvAutopilotStatus.setClickable(true); } else { ctvAutopilotStatusTv.setTextColor(getResources().getColor(R.color.bus_autopilot_text_color_normal)); ctvAutopilotStatusTv.setText(getResources().getString(R.string.bus_loading_autopilot_runnig_tv)); ctvAutopilotStatusIv.setImageResource(R.drawable.bus_ic_autopilot); - ctvAutopilotStatus.setFocusableInTouchMode(true); + ctvAutopilotStatus.setClickable(true); if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE == autopilotStatus) {//1可用 ctvAutopilotStatus.setSelected(false); }else if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == autopilotStatus){ @@ -381,12 +376,12 @@ public abstract class BaseBusTabFragment ctvAutopilotStatusTv.setTextColor(getResources().getColor(R.color.bus_autopilot_text_color_normal)); ctvAutopilotStatusTv.setText(getResources().getString(R.string.bus_loading_autopilot_success_tv)); ctvAutopilotStatus.setSelected(false); - ctvAutopilotStatus.setFocusableInTouchMode(false); + ctvAutopilotStatus.setClickable(false); }else { ctvAutopilotStatusIv.setImageResource(R.drawable.bus_wrong_autopilot_icon); ctvAutopilotStatusTv.setTextColor(getResources().getColor(R.color.bus_autopilot_text_color_normal)); ctvAutopilotStatusTv.setText(getResources().getString(R.string.bus_loading_autopilot_failure_tv)); - ctvAutopilotStatus.setFocusableInTouchMode(false); + ctvAutopilotStatus.setClickable(false); ctvAutopilotStatus.setSelected(false); } UiThreadHandler.postDelayed(new Runnable() { @@ -480,7 +475,7 @@ public abstract class BaseBusTabFragment ctvAutopilotStatusTv.setText(getResources().getString(R.string.bus_loading_autopilot_tv)); ctvAutopilotStatusTv.setTextColor(getResources().getColor(R.color.bus_autopilot_text_color_normal)); ctvAutopilotStatus.setSelected(false); - ctvAutopilotStatus.setFocusableInTouchMode(true); + ctvAutopilotStatus.setClickable(true); ctvAutopilotStatusIv.setImageResource(R.drawable.bus_loading_autopilot_icon); if (autopilotLoadingAnimator == null) { autopilotLoadingAnimator = ObjectAnimator.ofFloat(ctvAutopilotStatusIv, "rotation", 0f, 360f); diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 529d48ebbb..645690253e 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -76,14 +76,8 @@ public class BusFragment extends BaseBusTabFragment mSwitchLine.setTag(0); mLineName = findViewById(R.id.module_och_bus_line_name); -// if (DebugConfig.isDebug()) { //任意模式下都打开调试面板 -// mBus.setOnClickListener(view -> { -// ToastUtils.showShort("重置了车站状态"); -// mPresenter.queryBusRoutes(); -// }); - - //debug下调用测试面板 - mCurrentStationName.setOnLongClickListener(v -> { + //调用测试面板 + mCurrentStationName.setOnLongClickListener(v -> { debugTestBar(); showHideTestBar(); return true; @@ -92,21 +86,8 @@ public class BusFragment extends BaseBusTabFragment CallerLogger.INSTANCE.d(M_BUS + TAG, "initView: " + CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()); // 初始化的时候设置 UI 按钮状态 - switch (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()) { - case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE: - hideAutopilotBiz(); - break; - case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE: - showAutopilotBiz(); - onAutopilotStatusChanged(IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE); - break; - case IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING: - showAutopilotBiz(); - onAutopilotStatusChanged(IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING); - break; - default: - break; - } + showAutopilotBiz(); + mSwitchLine.setOnClickListener(this); } From 453ed4c39d4a58cb11f0109ac03a094f94a01ee7 Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 8 Sep 2022 17:59:05 +0800 Subject: [PATCH 7/9] =?UTF-8?q?[=E7=8A=B6=E6=80=81=E6=A0=8F]=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo_core_function_devatools/status/flow/can/CanImpl.kt | 2 +- .../mogo_core_function_devatools/status/flow/nets/NetsImpl.kt | 2 +- .../mogo_core_function_devatools/status/flow/rtk/RTKImpl.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt index 0e254a00b2..cfebc1ad24 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/can/CanImpl.kt @@ -97,7 +97,7 @@ internal class CanImpl(ctx: Context): IFlow(ctx), IMoGoAutopilotVehic private fun timeOutCheck() { job?.safeCancel() - launch(Dispatchers.Default) { + launch(Dispatchers.Unconfined) { delay(4000) send(CanStatus(isCanEnabled())) }.also { job = it } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt index 0adb0bee7c..89564cb8e0 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/nets/NetsImpl.kt @@ -79,7 +79,7 @@ internal class NetsImpl(ctx: Context): IFlow(ctx) { private fun checkAndSend() { loopCheckAndSendJob?.safeCancel() - launch(Dispatchers.Default) { + launch(Dispatchers.Unconfined) { val connectionInfo = wifiMgr.connectionInfo val enabled = isNetConnected() val name = diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/rtk/RTKImpl.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/rtk/RTKImpl.kt index b5108cb4c9..c5663854b5 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/rtk/RTKImpl.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/status/flow/rtk/RTKImpl.kt @@ -44,7 +44,7 @@ internal class RTKImpl(ctx: Context): IFlow(ctx), IMoGoAutopilotStatu return } check?.takeIf { it.isActive }?.cancel() - launch { + launch(Dispatchers.Unconfined) { CallerAutoPilotManager.sendStatusQueryReq() delay(5000) isOldVersion.set(true) @@ -82,7 +82,7 @@ internal class RTKImpl(ctx: Context): IFlow(ctx), IMoGoAutopilotStatu if (isRTKEnabled()) { send(RTKStatus("RTK", 0)) timeOutCheck?.takeIf { it.isActive }?.cancel() - launch { + launch(Dispatchers.Unconfined) { delay(4000) send(RTKStatus("", -1)) }.also { From 1ada85f5ae21d832dbe9824da515f0432954d0e4 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 8 Sep 2022 18:10:16 +0800 Subject: [PATCH 8/9] =?UTF-8?q?[2.10.0]bus=E5=8F=B8=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E8=BF=9B=E7=AB=99=E4=B8=8D=E5=8F=AF=E7=82=B9=E5=87=BB=E6=97=B6?= =?UTF-8?q?=E5=80=99=EF=BC=8C=E5=8F=8C=E5=87=BB=E4=BC=A0=E9=80=92=E5=88=B0?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=94=BE=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index bd8664c98e..adbbf2c0eb 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -312,7 +312,7 @@ public abstract class BaseBusTabFragment */ public void setArrivedClikable(boolean isClickable){ getActivity().runOnUiThread(() -> { - tvArrived.setClickable(isClickable); + tvArrived.setEnabled(isClickable); if (isClickable){ tvArrived.setTextColor(getResources().getColor(R.color.bus_white)); }else { From 858d3579472cb57c66027b13fea1764e15e0d6e3 Mon Sep 17 00:00:00 2001 From: renwj Date: Thu, 8 Sep 2022 18:11:45 +0800 Subject: [PATCH 9/9] =?UTF-8?q?[=E7=BA=BF=E7=A8=8B=E4=BC=98=E5=8C=96]?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9e2a5fbcb8..bf97491d67 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ buildscript { classpath "com.bytedance.android.byteX:base-plugin:0.3.0" classpath "com.mogo.cloud:hook:${HOOK_LOG_VERSION}" classpath 'com.volcengine:apm_insight_plugin:1.4.1' - classpath 'com.mogo.thread.opt:plg:2.2.2' + classpath 'com.mogo.thread.opt:plg:2.2.10' classpath 'com.mogo.cloud:systrace:1.0.1' classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' classpath 'com.mogo.sticky:service:1.0.8'