From 053ae16fd1745534cfd66c84c09845e949de5246 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Sat, 11 Mar 2023 11:51:06 +0800
Subject: [PATCH] =?UTF-8?q?[M2]=20=E8=A7=86=E9=A2=91=E7=BB=98=E5=88=B6?=
 =?UTF-8?q?=E9=80=89opengl,=E8=B5=B0=E9=A9=AC=E7=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/passenger/ui/PM2DrivingInfoFragment.kt     |  3 +++
 .../passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt |  2 +-
 .../src/m2/res/layout/p_m2_driving_info_fragment.xml   | 10 ++++++----
 app/productFlavors/fOchBusPassengerM2.gradle           |  2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
index f90ed5d53e..b0f91553f3 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2DrivingInfoFragment.kt
@@ -49,6 +49,9 @@ class PM2DrivingInfoFragment :
             context?.let { it -> ToggleDebugView.toggleDebugView.toggle(it) }
         }
 
+        context?.getColor(R.color.m2_line_name_tv_color)?.let { line_name_tv.setTextColor(it) }
+        context?.getColor(R.color.m2_line_name_tv_color)?.let { station_name_tv.setTextColor(it) }
+
 //        current_time_tv.onClick {
 
 //            //测试V2X消息
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 fcc5311650..7e0e1a06e6 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
@@ -20,7 +20,7 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer {
     init {
         hideWidget()
         GSYVideoType.setShowType(GSYVideoType.SCREEN_MATCH_FULL)
-        GSYVideoType.setRenderType(GSYVideoType.TEXTURE)
+        GSYVideoType.setRenderType(GSYVideoType.GLSURFACE)
     }
 
     override fun hideAllWidget() {
diff --git a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
index ced2b0bd90..1b38e23580 100644
--- a/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m2/res/layout/p_m2_driving_info_fragment.xml
@@ -123,16 +123,17 @@
 
         <com.mogo.och.common.module.wigets.MarqueeTextView
             android:id="@+id/station_name_tv"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dp_240"
             android:layout_height="wrap_content"
             android:textStyle="bold"
             android:singleLine="true"
             android:ellipsize="marquee"
             android:marqueeRepeatLimit="marquee_forever"
+            app:customGap="0.5"
+            app:useCustomGap="true"
             android:text="@string/m2_p_empty_tv"
             android:textSize="@dimen/dp_22"
             android:layout_marginTop="@dimen/dp_8"
-            app:layout_constraintRight_toRightOf="@+id/img_line_location_bg"
             app:layout_constraintTop_toBottomOf="@+id/station_name_title_tv"
             app:layout_constraintLeft_toLeftOf="@+id/speed_tv"
             android:textColor="@color/m2_line_name_tv_color"/>
@@ -184,15 +185,16 @@
 
         <com.mogo.och.common.module.wigets.MarqueeTextView
             android:id="@+id/line_name_tv"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dp_240"
             android:layout_height="wrap_content"
             android:textStyle="bold"
             android:singleLine="true"
             android:ellipsize="marquee"
             android:marqueeRepeatLimit="marquee_forever"
+            app:customGap="0.5"
+            app:useCustomGap="true"
             android:layout_marginTop="@dimen/dp_40"
             android:textSize="@dimen/dp_22"
-            app:layout_constraintRight_toRightOf="@+id/img_line_location_bg"
             app:layout_constraintTop_toTopOf="@+id/img_time_bg"
             app:layout_constraintLeft_toLeftOf="@+id/speed_tv"
             android:textColor="@color/m2_line_name_tv_color"/>
diff --git a/app/productFlavors/fOchBusPassengerM2.gradle b/app/productFlavors/fOchBusPassengerM2.gradle
index d99a8b239c..b298278764 100644
--- a/app/productFlavors/fOchBusPassengerM2.gradle
+++ b/app/productFlavors/fOchBusPassengerM2.gradle
@@ -38,7 +38,7 @@ project.android.productFlavors {
         buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
 
         // 构建的是否要动态更换模型
-        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
+        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false'
         // 是否需要重写状态栏
         buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'