From c0e16889581d26b99858e5e5d6298487331a9fff Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Mon, 15 May 2023 16:45:24 +0800
Subject: [PATCH] =?UTF-8?q?[3.2.0]=20shuttle=E4=B9=98=E5=AE=A2=E5=B1=8F?=
 =?UTF-8?q?=EF=BC=8CUI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../och/bus/passenger/ui/BusPStatusBarView.kt |   2 +-
 .../jinlvvan/res/drawable/bg_status_bar.xml   |   3 +-
 .../res/layout/bus_p_base_fragment.xml        | 137 +-----------------
 app/script/productFlavors/shuttle.gradle      |   2 +-
 4 files changed, 6 insertions(+), 138 deletions(-)

diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt
index 3cbe38d985..4bb0bd9403 100644
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/ui/BusPStatusBarView.kt
@@ -35,7 +35,7 @@ class BusPStatusBarView @JvmOverloads constructor(
 
     init {
         LayoutInflater.from(context).inflate(R.layout.p_bus_view_status_bar, this, true)
-        setBackgroundColor(Color.parseColor("#80FFFFFF"))
+        setBackgroundResource(R.drawable.bg_status_bar)
         isClickable = true
         isFocusable = true
     }
diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_status_bar.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_status_bar.xml
index 36611a9a99..5b8da3c82c 100644
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_status_bar.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/drawable/bg_status_bar.xml
@@ -2,7 +2,8 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <gradient android:startColor="@android:color/white"
+        android:centerColor="#00FFFFFF"
         android:endColor="#00FFFFFF"
-        android:angle="315"
+        android:angle="0"
         />
 </shape>
\ No newline at end of file
diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
index 841a1aefed..9f240c07a4 100644
--- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
+++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/res/layout/bus_p_base_fragment.xml
@@ -27,55 +27,20 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-<!--    <com.mogo.eagle.core.function.hmi.ui.widget.SteeringWheelView-->
-<!--        android:id="@+id/steering_wheel"-->
-<!--        android:layout_width="@dimen/dp_490"-->
-<!--        android:layout_height="@dimen/dp_490"-->
-<!--        android:layout_marginLeft="@dimen/dp_50"-->
-<!--        android:layout_marginTop="@dimen/dp_88"-->
-<!--        app:layout_constraintLeft_toLeftOf="parent"-->
-<!--        app:layout_constraintTop_toTopOf="parent" />-->
-
-<!--    <ImageView-->
-<!--        android:id="@+id/bus_p_autopilot_iv"-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin"-->
-<!--        android:layout_marginTop="@dimen/dp_112"-->
-<!--        android:scaleType="fitXY"-->
-<!--        android:visibility="gone"-->
-<!--        android:layout_gravity="center_horizontal"-->
-<!--        android:src="@drawable/bus_p_un_auto_nor"-->
-<!--        app:layout_constraintLeft_toLeftOf="parent"-->
-<!--        app:layout_constraintTop_toTopOf="parent"/>-->
-
     <!--浓雾预警动画-->
     <com.mogo.eagle.core.function.hmi.ui.widget.V2XFogEventView
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-<!--    <com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView-->
-<!--        android:id="@+id/ivMoGoLogo"-->
-<!--        android:layout_width="@dimen/dp_121"-->
-<!--        android:layout_height="@dimen/dp_121"-->
-<!--        android:layout_marginRight="@dimen/dp_751"-->
-<!--        android:layout_marginBottom="@dimen/dp_59"-->
-<!--        android:background="@drawable/roma_bus_p_bg_selector"-->
-<!--        app:layout_constraintBottom_toBottomOf="parent"-->
-<!--        app:layout_constraintRight_toRightOf="parent"-->
-<!--        app:roma_close="@drawable/roma_bus_p_bg_selector"-->
-<!--        app:roma_open="@drawable/iv_roma_bus_passenger_press_bg" />-->
-
-
     <com.mogo.eagle.core.function.hmi.ui.widget.RomaPassengerView
         android:id="@+id/ivMoGoLogo"
         android:layout_width="@dimen/dp_121"
         android:layout_height="@dimen/dp_121"
         android:layout_marginRight="@dimen/dp_751"
-        android:layout_marginBottom="@dimen/dp_59"
+        android:layout_marginBottom="@dimen/dp_40"
         android:background="@drawable/roma_bus_p_bg_selector"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
         app:roma_close="@drawable/roma_bus_p_bg_selector"
         app:roma_open="@drawable/iv_roma_bus_passenger_press_bg" />
 
@@ -89,95 +54,6 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
-<!--    <com.mogo.och.common.module.wigets.OCHBorderShadowLayout-->
-<!--        android:id="@+id/arrive_station_shadow"-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:layout_marginLeft="@dimen/bus_p_curent_station_panel_margin_left"-->
-<!--        android:layout_marginBottom="@dimen/bus_p_curent_station_panel_margin"-->
-<!--        app:bgColor="@android:color/transparent"-->
-<!--        app:blurRadius="@dimen/dp_30"-->
-<!--        app:layout_constraintBottom_toBottomOf="parent"-->
-<!--        app:layout_constraintLeft_toLeftOf="parent"-->
-<!--        app:shadowColor="@color/bus_p_panel_edge_shadow"-->
-<!--        app:shadowRadius="@dimen/dp_30"-->
-<!--        app:xOffset="0dp"-->
-<!--        app:yOffset="0dp">-->
-
-<!--        <androidx.constraintlayout.widget.ConstraintLayout-->
-<!--            android:layout_width="@dimen/bus_p_curent_station_panel_width"-->
-<!--            android:layout_height="@dimen/bus_p_curent_station_panel_height"-->
-<!--            android:layout_margin="@dimen/dp_10"-->
-<!--            android:background="@drawable/bus_p_panel_cur_station_panel">-->
-
-<!--            <TextView-->
-<!--                android:id="@+id/bus_p_cur_station_title"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_marginLeft="@dimen/dp_56"-->
-<!--                android:layout_marginTop="@dimen/dp_40"-->
-<!--                android:elevation="@dimen/dp_10"-->
-<!--                android:text="@string/bus_p_cur_station_title"-->
-<!--                android:textColor="@color/bus_p_panel_cur_txt_color"-->
-<!--                android:textSize="@dimen/bus_p_curent_station_txt_size"-->
-<!--                android:textStyle="bold"-->
-<!--                app:layout_constraintLeft_toLeftOf="parent"-->
-<!--                app:layout_constraintTop_toTopOf="parent" />-->
-
-<!--            <TextView-->
-<!--                android:id="@+id/bus_p_cur_station_name"-->
-<!--                android:layout_width="@dimen/bus_p_curent_station_txt_width"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_marginTop="@dimen/dp_12"-->
-<!--                android:elevation="@dimen/dp_10"-->
-<!--                android:ellipsize="end"-->
-<!--                android:maxLines="1"-->
-<!--                android:text="&#45;&#45; &#45;&#45;"-->
-<!--                android:textColor="@color/bus_p_panel_cur_station_txt_color"-->
-<!--                android:textSize="@dimen/bus_p_curent_station_txt_size1"-->
-<!--                android:textStyle="bold"-->
-<!--                app:layout_constraintLeft_toLeftOf="@+id/bus_p_cur_station_title"-->
-<!--                app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_station_title" />-->
-<!--            <androidx.appcompat.widget.AppCompatImageView-->
-<!--                android:layout_width="@dimen/dp_20"-->
-<!--                android:layout_height="@dimen/dp_27"-->
-<!--                app:layout_constraintTop_toTopOf="@+id/bus_p_cur_station_name"-->
-<!--                app:layout_constraintBottom_toBottomOf="@+id/bus_p_cur_station_name"-->
-<!--                app:layout_constraintRight_toLeftOf="@+id/bus_p_cur_station_name"-->
-<!--                android:layout_marginRight="@dimen/dp_10"-->
-<!--                android:src="@drawable/station_arrow">-->
-
-<!--            </androidx.appcompat.widget.AppCompatImageView>-->
-
-<!--            <TextView-->
-<!--                android:id="@+id/bus_p_cur_station_tip"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_marginTop="@dimen/dp_20"-->
-<!--                android:elevation="@dimen/dp_10"-->
-<!--                android:text="@string/bus_p_cur_station_arrived_tip"-->
-<!--                android:textColor="@color/bus_p_panel_cur_station_tips_color"-->
-<!--                android:textSize="@dimen/bus_p_curent_station_tip_size1"-->
-<!--                android:textStyle="bold"-->
-<!--                app:layout_constraintLeft_toLeftOf="@+id/bus_p_cur_station_name"-->
-<!--                app:layout_constraintTop_toBottomOf="@+id/bus_p_cur_station_name" />-->
-
-<!--            <androidx.core.widget.ContentLoadingProgressBar-->
-<!--                android:id="@+id/bus_progress_bar"-->
-<!--                android:layout_width="0dp"-->
-<!--                android:layout_height="@dimen/dp_10"-->
-<!--                android:progress="0"-->
-<!--                style="@style/Widget.AppCompat.ProgressBar.Horizontal"-->
-<!--                app:layout_constraintBottom_toBottomOf="parent"-->
-<!--                app:layout_constraintLeft_toLeftOf="parent"-->
-<!--                android:layout_marginLeft="@dimen/dp_12"-->
-<!--                android:layout_marginRight="@dimen/dp_15"-->
-<!--                app:layout_constraintRight_toRightOf="parent"-->
-<!--                android:progressDrawable="@drawable/bus_progress_bar_bg" />-->
-<!--        </androidx.constraintlayout.widget.ConstraintLayout>-->
-
-<!--    </com.mogo.och.common.module.wigets.OCHBorderShadowLayout>-->
-
     <FrameLayout
         android:id="@+id/bus_p_route_panel"
         android:layout_width="wrap_content"
@@ -185,15 +61,6 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-<!--    <ImageView-->
-<!--        android:layout_width="@dimen/dp_299"-->
-<!--        android:layout_height="@dimen/dp_75"-->
-<!--        android:layout_marginRight="@dimen/dp_40"-->
-<!--        android:layout_marginBottom="@dimen/dp_48"-->
-<!--        android:src="@drawable/bus_p_mogo_nor"-->
-<!--        app:layout_constraintBottom_toBottomOf="parent"-->
-<!--        app:layout_constraintRight_toLeftOf="@+id/bus_p_route_panel" />-->
-
     <com.mogo.eagle.core.function.hmi.ui.msgbox.BusPassengerMsgBoxBubbleView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/script/productFlavors/shuttle.gradle b/app/script/productFlavors/shuttle.gradle
index 2544d9c22c..dc5ecd99a1 100644
--- a/app/script/productFlavors/shuttle.gradle
+++ b/app/script/productFlavors/shuttle.gradle
@@ -36,7 +36,7 @@ project.android.productFlavors {
             }
             if(isJL()){
                 // ③是否需要重写状态栏
-                buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
+                buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'
                 // ④构建 是否支持多屏异显异交互
                 buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true'
                 manifestPlaceholders.put("SCREEN_ORIENTATION", "landscape")