Merge branch 'dev_robotaxi-d_230711_3.4.0' into dev_20230708_unmanned_3.5.0

# Conflicts:
#	OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arrived.png
#	OCH/taxi/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_overmap_arriving.png

OCH/mogo-och-common-module/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt

@@ -74,10 +74,10 @@ object DebugDataDispatch {
 
     fun getLocaitonByLog(path:String) {
         ThreadUtils.getIoPool().execute {
-            val inputStream = FileInputStream(path)
-            val reader = BufferedReader(InputStreamReader(inputStream))
-            var line: String? = ""
             try {
+                val inputStream = FileInputStream(path)
+                val reader = BufferedReader(InputStreamReader(inputStream))
+                var line: String? = ""
                 while (reader.readLine().also { line = it } != null) {
                     val list = GsonUtils.fromJson<MogoLocationExit>(
                         line.toString(),

OCH/taxi/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/widget/ConsultVideoPlayer.kt

@@ -17,7 +17,6 @@ import android.widget.TextView
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.app.ActivityCompat
-import com.mogo.eagle.core.utilcode.util.ActivityUtils
 import com.mogo.eagle.core.utilcode.util.TimeTransformUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider
@@ -155,7 +154,9 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer {
         super.onWindowFocusChanged(hasWindowFocus)
         if(isIfCurrentIsFullscreen&&smalllPlayer!=null){
             if(hasWindowFocus){//获取焦点
-                //onVideoResume()
+                if (isInPlayingState && smalllPlayer!!.mCurrentState != CURRENT_STATE_PAUSE) {
+                    onVideoResume()
+                }
             }else{
                 onVideoPause()
             }

OCH/taxi/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml

@@ -14,6 +14,8 @@
         app:endPointDrawable="@drawable/taxi_p_map_view_dir_end"
         app:carDrawable="@drawable/taxi_p_map_car"
         app:compassDrawable="@drawable/taxi_p_map_car_light"
+        app:arrivedDrawable="@drawable/taxi_overmap_arrived"
+        app:unArrivedDrawable="@drawable/taxi_overmap_arriving"
         app:mapStyleExtraPath="style_extra.data"
         app:mapStylePath="style.data"
         app:leftPadding="800"

app/src/androidTest/java/com/mogo/functions/test/ChatTest.kt

@@ -0,0 +1,46 @@
+package com.mogo.functions.test
+
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import androidx.test.platform.app.InstrumentationRegistry
+import com.mogo.eagle.core.function.call.chat.CallerChatManager
+import com.mogo.eagle.core.function.main.MainLauncherActivity
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
+
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class ChatTest {
+
+
+
+    lateinit var launch: ActivityScenario<MainLauncherActivity>
+
+
+    @Before
+    fun before() {
+        launch = ActivityScenario.launch(MainLauncherActivity::class.java)
+    }
+
+    @Test
+    fun testChat() = runBlocking {
+        val arguments = InstrumentationRegistry.getArguments()
+        val delay = arguments.getString("delay", "0")
+        val sn = arguments.getString("sn", "")
+        val delayLong = delay.toLong()
+        if (delayLong <= 0 || sn.isNullOrEmpty()) {
+            throw AssertionError("illegal state ..")
+        }
+        delay(delayLong)
+        launch.onActivity { activity ->
+            CallerChatManager.call(activity, sn)
+        }
+        delay(TimeUnit.MINUTES.toMillis(10))
+    }
+}

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiProvider.kt

@@ -26,7 +26,6 @@ import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.call.hmi.*
 import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.call.v2x.CallerTurnLightListenerManager
-import com.mogo.eagle.core.function.call.v2x.CallerV2XWarningListenerManager
 import com.mogo.eagle.core.function.hmi.ui.camera.RoadVideoDialog
 import com.mogo.eagle.core.function.hmi.ui.lookaround.*
 import com.mogo.eagle.core.function.hmi.ui.notice.DispatchDialogManager
@@ -132,7 +131,7 @@ class MoGoHmiProvider : IMoGoHmiProvider {
                 return
             }
             listener?.onShow()
-            CallerV2XWarningListenerManager.show(v2xType, direction, expireTime)
+            //CallerV2XWarningListenerManager.show(v2xType, direction, expireTime)
             CallerLogger.d(
                 "$M_HMI$TAG",
                 "--- show v2x dialog 1 ---: info -> v2x-type: $v2xType : expireTime: $expireTime"
@@ -207,11 +206,11 @@ class MoGoHmiProvider : IMoGoHmiProvider {
     }
 
     override fun showWarning(v2xType: String, direction: WarningDirectionEnum, expireTime: Long) {
-        CallerV2XWarningListenerManager.show(v2xType, direction, expireTime)
+        //CallerV2XWarningListenerManager.show(v2xType, direction, expireTime)
     }
 
     override fun dismissWarning(direction: WarningDirectionEnum) {
-        CallerV2XWarningListenerManager.dismiss(direction)
+        //CallerV2XWarningListenerManager.dismiss(direction)
     }
 
     override fun showDispatchDialog(msgData: DispatchAdasAutoPilotLocReceiverBean) {