From 0b862f636379c029607152f2ef6f9aa1c4b9971a Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 2 Mar 2023 14:48:04 +0800
Subject: [PATCH] =?UTF-8?q?[M2]=201=E3=80=81=E8=A7=86=E9=A2=91=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E6=96=B9=E5=BC=8F=202=E3=80=81=E8=B5=B0=E9=A9=AC?=
 =?UTF-8?q?=E7=81=AF=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/widget/video/AdvanceGSYVideoPlayer.kt  | 27 ++++++++++---------
 .../common/module/wigets/MarqueeTextView.java |  2 +-
 .../mogo/launcher/startup/ConfigStartUp.kt    |  9 ++++++-
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
index 0a55e1b913..2cb70cebd6 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt
@@ -17,7 +17,8 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer {
 
     init {
         hideWidget()
-        GSYVideoType.setShowType(com.shuyu.gsyvideoplayer.utils.GSYVideoType.SCREEN_MATCH_FULL)
+        GSYVideoType.setShowType(GSYVideoType.SCREEN_MATCH_FULL)
+        GSYVideoType.setRenderType(GSYVideoType.GLSURFACE)
     }
 
     override fun hideAllWidget() {
@@ -50,19 +51,19 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer {
     }
 
     private fun hideWidget(){
-        setViewShowState(mBottomContainer, GONE)
-        setViewShowState(mProgressBar, GONE)
-        setViewShowState(mCurrentTimeTextView, GONE)
-        setViewShowState(mTotalTimeTextView, GONE)
-        setViewShowState(mBottomProgressBar, GONE)
-        setViewShowState(mBackButton, GONE)
-        setViewShowState(mStartButton, GONE)
+        setViewShowState(mBottomContainer, INVISIBLE)
+        setViewShowState(mProgressBar, INVISIBLE)
+        setViewShowState(mCurrentTimeTextView, INVISIBLE)
+        setViewShowState(mTotalTimeTextView, INVISIBLE)
+        setViewShowState(mBottomProgressBar, INVISIBLE)
+        setViewShowState(mBackButton, INVISIBLE)
+        setViewShowState(mStartButton, INVISIBLE)
 
-        setViewShowState(mTopContainer, GONE)
+        setViewShowState(mTopContainer, INVISIBLE)
 
-        setViewShowState(mLoadingProgressBar, GONE)
+        setViewShowState(mLoadingProgressBar, INVISIBLE)
         setViewShowState(
-            mLockScreen, GONE
+            mLockScreen, INVISIBLE
         )
 
         setIsTouchWiget(false)
@@ -75,7 +76,7 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer {
     }
 
     fun setCacheImageViewGone() {
-        setViewShowState(mThumbImageViewLayout, GONE)
-        setViewShowState(mThumbImageView, GONE)
+        setViewShowState(mThumbImageViewLayout, INVISIBLE)
+        setViewShowState(mThumbImageView, INVISIBLE)
     }
 }
\ No newline at end of file
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java
index 884d504338..bc1d6a489b 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java
@@ -21,7 +21,7 @@ public class MarqueeTextView extends androidx.appcompat.widget.AppCompatTextView
     /**
      * 自定义 gap
      */
-    private float mCustomGap = 0.3f;
+    private float mCustomGap = 0.5f;
     /**
      * 是否使用自定义 gap
      */
diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
index d952367b9b..38a764668a 100644
--- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
+++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
@@ -91,10 +91,17 @@ object ConfigStartUp {
             HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei
         } else if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){
             HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
+        } else if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){
+            HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
+        } else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)){
+            HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache
         }
 
         if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
-            if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
+            if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) ||
+                AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)
+                || AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) ||
+                AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) {
                 //是否显示 限速UI
                 HmiBuildConfig.isShowLimitingVelocityView = false
                 //白天模式