Merge branch 'dev_minibus-d_230425_3.2.0' into merge320tomaster

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)
             }
         }
     }

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
         }