From 900a74c9ed2a75515d78f2760537d90ce696e7dd Mon Sep 17 00:00:00 2001 From: renwj Date: Mon, 12 Jun 2023 16:02:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[3.2.0]=20=E4=BF=AE=E6=AD=A3=E8=BD=A6?= =?UTF-8?q?=E8=81=8A=E8=81=8A=E5=81=B6=E7=8E=B0=E7=9A=84=E6=9D=A5=E7=94=B5?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=B8=8E=E7=AD=89=E5=BE=85=E6=8E=A5=E5=90=AC?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=87=8D=E5=8F=A0=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/chat/facade/ui/CallChatWindowManager.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/ui/CallChatWindowManager.kt b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/ui/CallChatWindowManager.kt index a750dbdf93..3d9ea56a48 100644 --- a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/ui/CallChatWindowManager.kt +++ b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/ui/CallChatWindowManager.kt @@ -405,6 +405,9 @@ internal class CallChatWindowManager { } private fun hide(view: View) { + if (view != null && view.visibility == View.VISIBLE) { + view.visibility = View.INVISIBLE + } if (!ViewCompat.isAttachedToWindow(view)) { return } From be460f1a071c750f5dacdd2841f855b646479555 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 12 Jun 2023 17:26:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusPassengerFunctionOrderPresenter.kt | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt index 3165f5ed7a..89b6c2bcef 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/presenter/BusPassengerFunctionOrderPresenter.kt @@ -67,7 +67,7 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : CharterPassengerModel.setStatusChangeListener(TAG,this) CallerTelematicListenerManager.addListener(TAG, msgReceived) val currentOrderStatus = CharterPassengerModel.getCurrentOrderStatus() - onStatusChange(currentOrderStatus) + needRunUI(currentOrderStatus) extracted() } @@ -293,17 +293,21 @@ class BusPassengerFunctionOrderPresenter(view: M1OrderLineFragment?) : override fun onStatusChange(currentStatus: OrderStatusEnum) { UiThreadHandler.post { - when (currentStatus) { - OrderStatusEnum.OrderNoLine -> { - mView?.setVisableByTrun(showBiz = true) - extracted() - } - OrderStatusEnum.OrdersWithLine ->{ - mView?.setVisableByTrun(showBiz = true) - } - else ->{ - mView?.setVisableByTrun(showNorOrder = true) - } + needRunUI(currentStatus) + } + } + + private fun needRunUI(currentStatus: OrderStatusEnum){ + when (currentStatus) { + OrderStatusEnum.OrderNoLine -> { + mView?.setVisableByTrun(showBiz = true) + extracted() + } + OrderStatusEnum.OrdersWithLine ->{ + mView?.setVisableByTrun(showBiz = true) + } + else ->{ + mView?.setVisableByTrun(showNorOrder = true) } } }