From a9291ac5bc37a4f27726a5dd21f9d538df9c90ef Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Sun, 29 Jan 2023 18:48:45 +0800
Subject: [PATCH] =?UTF-8?q?[1.0.0]=20[m1]=20[=E8=83=8C=E6=99=AF=E9=80=8F?=
 =?UTF-8?q?=E6=98=8E]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../passenger/ui/BusPassengerFunctionFragment.kt   |  3 ---
 .../bus_p_function_setting_soft_fragment.xml       | 14 ++++++++------
 .../src/m1/res/values/styles.xml                   |  1 +
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt
index 39310f52e5..60d4ab23ca 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt
+++ b/OCH/mogo-och-bus-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/BusPassengerFunctionFragment.kt
@@ -1,7 +1,5 @@
 package com.mogo.och.bus.passenger.ui
 
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.util.Log
 import android.widget.CompoundButton
@@ -73,7 +71,6 @@ class BusPassengerFunctionFragment :
     override fun initViews() {
         dialog?.window?.let {
             BarUtils.hideStatusBarAndSticky(it)
-            it.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT));
         }
         dialog?.setCancelable(false)
     }
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml
index d765f6a2ff..993a330826 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml
+++ b/OCH/mogo-och-bus-passenger/src/m1/res/layout/bus_p_function_setting_soft_fragment.xml
@@ -2,15 +2,17 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/holo_green_dark"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <TextView
-        android:text="soft"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        app:layout_constraintDimensionRatio="3:1"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@android:color/holo_green_dark"
+        android:layout_width="0dp"
+        android:layout_height="0dp">
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/OCH/mogo-och-bus-passenger/src/m1/res/values/styles.xml b/OCH/mogo-och-bus-passenger/src/m1/res/values/styles.xml
index d1f31905d6..9862547eb8 100644
--- a/OCH/mogo-och-bus-passenger/src/m1/res/values/styles.xml
+++ b/OCH/mogo-och-bus-passenger/src/m1/res/values/styles.xml
@@ -17,6 +17,7 @@
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowFullscreen">false</item>
+        <item name="android:backgroundDimEnabled">false</item>
     </style>