From 840af54c8d950c7da4bbcbe5e915c9923da705a9 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Thu, 16 Feb 2023 14:14:00 +0800 Subject: [PATCH] =?UTF-8?q?[m1]=20[1.0.2]=20[=E7=8A=B6=E6=80=81=E6=A0=8F?= =?UTF-8?q?=E9=80=8F=E6=98=8E=E5=BA=A6=E3=80=812560x1600=20=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E7=BC=A9=E6=94=BE=E8=BF=87=E5=B0=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/passenger/view/ConsultVideoPlayer.kt | 2 +- .../bus/passenger/view/statusbar/StatusBarView.kt | 3 ++- ...ge_normal.png => bus_p_player_change_normal.png} | Bin .../bus_p_function_video_player_change_normal.xml | 2 +- .../src/m1/res/values/color.xml | 1 + app/productFlavors/fOchBusPassenger.gradle | 3 +++ app/productFlavors/fOchBusPassengerM1.gradle | 2 +- 7 files changed, 9 insertions(+), 4 deletions(-) rename OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/{taxi_p_change_normal.png => bus_p_player_change_normal.png} (100%) diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt index f011f40ae5..aae880913f 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/ConsultVideoPlayer.kt @@ -98,7 +98,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { background.cornerRadii = x.toFloatArray() layoutBottom.background = background - fullscreenButton.setPadding(92,0,92,0) + //fullscreenButton.setPadding(0,0,0,0) titleTextView.setTextSize(TypedValue.COMPLEX_UNIT_PX, AutoSizeUtils.dp2px(context,40f).toFloat()) val layoutParams1 = titleTextView.layoutParams as ConstraintLayout.LayoutParams layoutParams1.marginStart = 80 diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt index ca0ee448d2..e89c18853c 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt +++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/view/statusbar/StatusBarView.kt @@ -7,6 +7,7 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.content.ContextCompat import chassis.ChassisStatesOuterClass import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.autopilot.IMoGoBatteryManagementSystemListener @@ -33,7 +34,7 @@ class StatusBarView @JvmOverloads constructor( init { LayoutInflater.from(context).inflate(R.layout.bus_p_m1_view_status_bar, this, true) - setBackgroundColor(Color.WHITE) + setBackgroundColor(ContextCompat.getColor(context,R.color.bus_p_m1_80ffffff)) } override fun onAttachedToWindow() { diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_change_normal.png b/OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_player_change_normal.png similarity index 100% rename from OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/taxi_p_change_normal.png rename to OCH/mogo-och-bus-passenger/src/m1/res/drawable-nodpi/bus_p_player_change_normal.png diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml index decd1b9565..9d6c30d367 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml +++ b/OCH/mogo-och-bus-passenger/src/m1/res/drawable/bus_p_function_video_player_change_normal.xml @@ -1,7 +1,7 @@ \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/values/color.xml b/OCH/mogo-och-bus-passenger/src/m1/res/values/color.xml index e7f1fa3fb1..b1c760a031 100644 --- a/OCH/mogo-och-bus-passenger/src/m1/res/values/color.xml +++ b/OCH/mogo-och-bus-passenger/src/m1/res/values/color.xml @@ -17,4 +17,5 @@ #56EFA0 #CCFFFFFF + #80FFFFFF \ No newline at end of file diff --git a/app/productFlavors/fOchBusPassenger.gradle b/app/productFlavors/fOchBusPassenger.gradle index 57f8521764..43f9ca3633 100644 --- a/app/productFlavors/fOchBusPassenger.gradle +++ b/app/productFlavors/fOchBusPassenger.gradle @@ -36,6 +36,9 @@ project.android.productFlavors { buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\"" // 构建的是否是演示（美化）模式 buildConfigField 'boolean', 'IS_DEMO_MODE', 'false' + // 构建的是否要动态更换模型 + buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false' + // 构建 是否支持多屏异显异交互 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' diff --git a/app/productFlavors/fOchBusPassengerM1.gradle b/app/productFlavors/fOchBusPassengerM1.gradle index 116a5588e4..09f8b37fbf 100644 --- a/app/productFlavors/fOchBusPassengerM1.gradle +++ b/app/productFlavors/fOchBusPassengerM1.gradle @@ -42,7 +42,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_MULTI_DISPLAY', 'false'