diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt
index 7a241e03da..dba3b14acc 100644
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/constant/BusPassengerConst.kt
@@ -39,7 +39,7 @@ class BusPassengerConst {
         // 未到站(未到站)
         const val STATION_STATUS_ARRIVING = 3
 
-        //bus平均速度
+        //bus平均速度 bus的平均里程：25km/h
         const val BUS_AVERAGE_SPEED = 25
 
         // 订单总里程
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java
index 629183bbb7..7e04f66bd0 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/BusProvider.java
@@ -60,7 +60,9 @@ public class BusProvider implements IMogoOCH {
             } else {
                 busFragment = new BusFragment();
             }
-            supportFragmentManager.beginTransaction().add(containerId, busFragment, BusFragment.TAG).commitAllowingStateLoss();
+            if(!busFragment.isAdded()) {
+                supportFragmentManager.beginTransaction().add(containerId, busFragment, BusFragment.TAG).commitAllowingStateLoss();
+            }
             return;
         }
         CallerLogger.INSTANCE.d(TAG, "准备show fragment");
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
index 944cad91bc..5eed6e1651 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
@@ -186,6 +186,7 @@ internal object BadCaseManager : LifecycleEventObserver {
 
                     override fun onFinish() {
                         passiveBadCaseWindow.hideFloatWindow()
+                        BadCaseConfig.windowNum--
                     }
                 }
                 countDownTimer.start()
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_msg_box.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_msg_box.png
index c901f3937b..7bb601b227 100644
Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_msg_box.png and b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_msg_box.png differ
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml
index 80c1f6b035..12a226d8e9 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_bad_case.xml
@@ -4,13 +4,13 @@
     android:layout_width="804px"
     android:layout_height="160px"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="#1A2344"
+    android:background="#53000000"
     app:roundLayoutRadius="24px"
     android:layout_gravity="center_horizontal"
     android:layout_marginStart="30px"
     android:layout_marginEnd="30px"
-    android:layout_marginTop="5px"
-    android:layout_marginBottom="5px"
+    android:layout_marginTop="7px"
+    android:layout_marginBottom="7px"
     android:clickable="true"
     >
 
@@ -43,7 +43,6 @@
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="@id/ivBadCaseImage"
         app:layout_constraintLeft_toRightOf="@id/ivBadCaseImage"
-        android:layout_marginBottom="5px"
         android:layout_marginStart="25px"
         android:textColor="#B3FFFFFF"
         android:textSize="30px"
@@ -68,12 +67,10 @@
         app:layout_constraintTop_toTopOf="@id/tvBagRecordTime"
         app:layout_constraintBottom_toBottomOf="@id/tvBagRecordTime"
         android:paddingEnd="25px"
-        android:paddingTop="10px"
-        android:paddingBottom="10px"
+        android:paddingStart="20px"
         android:text="查看"
         android:textColor="#FFFFFFFF"
         android:textSize="30px"
         />
 
-
 </com.mogo.eagle.core.widget.RoundConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml
index 24502b6625..2e26a4ebc0 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_ipc_report.xml
@@ -3,13 +3,13 @@
     android:layout_width="804px"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="#1A2344"
+    android:background="#53000000"
     app:roundLayoutRadius="24px"
     android:layout_gravity="center_horizontal"
     android:layout_marginStart="30px"
     android:layout_marginEnd="30px"
-    android:layout_marginTop="5px"
-    android:layout_marginBottom="5px"
+    android:layout_marginTop="7px"
+    android:layout_marginBottom="7px"
     >
 
     <ImageView
@@ -30,8 +30,8 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toRightOf="@id/ivReportImageNormal"
-        android:layout_marginTop="20px"
-        android:layout_marginStart="25px"
+        android:layout_marginTop="25px"
+        android:layout_marginStart="23px"
         android:textColor="#FFFFFFFF"
         android:textSize="32px"
         />
@@ -45,6 +45,7 @@
         android:textColor="#B3FFFFFF"
         android:textSize="28px"
         android:layout_marginTop="5px"
+        android:lineSpacingMultiplier="1.2"
         />
 
     <TextView
@@ -56,12 +57,13 @@
         app:layout_constraintRight_toRightOf="@id/tvStatusSelect"
         app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginTop="5px"
-        android:layout_marginBottom="10px"
+        android:layout_marginBottom="25px"
         android:textColor="#B3FFFFFF"
         android:gravity="start"
         android:textSize="28px"
         android:maxLines="1"
         android:ellipsize="end"
+        android:lineSpacingMultiplier="1.2"
         />
 
     <TextView
@@ -94,6 +96,7 @@
         android:layout_marginEnd="20px"
         android:textColor="#80FFFFFF"
         android:textSize="24px"
+        android:lineSpacingMultiplier="1.2"
         />
 
     <ImageView
@@ -116,7 +119,7 @@
         app:layout_constraintLeft_toRightOf="@id/ivReportImageOpen"
         android:textColor="#FFFFFFFF"
         android:textSize="32px"
-        android:layout_marginStart="20px"
+        android:layout_marginStart="10px"
         android:visibility="gone"
         />
 
@@ -126,9 +129,10 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@id/ivReportImageOpen"
         app:layout_constraintLeft_toLeftOf="@id/ivReportImageOpen"
-        android:layout_marginTop="5px"
+        android:layout_marginTop="10px"
         android:textColor="#B3FFFFFF"
         android:textSize="28px"
+        android:lineSpacingMultiplier="1.2"
         android:visibility="gone"
         />
 
@@ -138,9 +142,9 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toBottomOf="@id/tvReportTimeOpen"
         app:layout_constraintLeft_toLeftOf="@id/tvReportTimeOpen"
-        android:layout_marginTop="5px"
         android:textColor="#B3FFFFFF"
         android:textSize="28px"
+        android:lineSpacingMultiplier="1.2"
         android:visibility="gone"
         />
 
@@ -152,9 +156,9 @@
         app:layout_constraintLeft_toLeftOf="@id/tvReportTypeOpen"
         app:layout_constraintRight_toRightOf="@id/tvStatusSelect"
         android:gravity="start"
-        android:layout_marginTop="5px"
         android:textColor="#B3FFFFFF"
         android:textSize="28px"
+        android:lineSpacingMultiplier="1.2"
         android:visibility="gone"
         />
 
@@ -166,10 +170,10 @@
         app:layout_constraintLeft_toLeftOf="@id/tvReportReasonOpen"
         app:layout_constraintRight_toRightOf="@id/tvStatusSelect"
         app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginTop="5px"
-        android:layout_marginBottom="10px"
+        android:layout_marginBottom="15px"
         android:textColor="#B3FFFFFF"
         android:textSize="28px"
+        android:lineSpacingMultiplier="1.2"
         android:visibility="gone"
         />
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_notice.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_notice.xml
index 01f7a31bb5..38b8988e07 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_notice.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_notice.xml
@@ -3,13 +3,13 @@
     android:layout_width="804px"
     android:layout_height="160px"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="#1A2344"
+    android:background="#53000000"
     app:roundLayoutRadius="24px"
     android:layout_gravity="center_horizontal"
     android:layout_marginStart="30px"
     android:layout_marginEnd="30px"
-    android:layout_marginTop="5px"
-    android:layout_marginBottom="5px"
+    android:layout_marginTop="7px"
+    android:layout_marginBottom="7px"
     >
 
     <ImageView
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_operation.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_operation.xml
index 8ba4bf6b48..8537e5d213 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_operation.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_operation.xml
@@ -3,13 +3,13 @@
     android:layout_width="804px"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="#1A2344"
+    android:background="#53000000"
     app:roundLayoutRadius="24px"
     android:layout_gravity="center_horizontal"
     android:layout_marginStart="30px"
     android:layout_marginEnd="30px"
-    android:layout_marginTop="5px"
-    android:layout_marginBottom="5px"
+    android:layout_marginTop="7px"
+    android:layout_marginBottom="7px"
     >
 
     <ImageView
@@ -35,7 +35,7 @@
         android:text="运营平台"
         android:textColor="#FFFFFFFF"
         android:textSize="32px"
-        android:layout_marginStart="25px"
+        android:layout_marginStart="23px"
         />
 
     <TextView
@@ -51,6 +51,8 @@
         android:textSize="28px"
         android:maxLines="2"
         android:ellipsize="end"
+        android:paddingBottom="15px"
+        android:lineSpacingMultiplier="1.2"
         />
 
     <TextView
@@ -107,7 +109,7 @@
         android:text="运营平台"
         android:textColor="#FFFFFFFF"
         android:textSize="32px"
-        android:layout_marginStart="20px"
+        android:layout_marginStart="10px"
         android:visibility="gone"
         />
 
@@ -122,6 +124,7 @@
         android:gravity="start"
         android:layout_marginTop="10px"
         android:layout_marginBottom="15px"
+        android:lineSpacingMultiplier="1.2"
         android:textColor="#B3FFFFFF"
         android:textSize="28px"
         android:visibility="gone"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_v2x.xml
index 25a3830336..808e8e2396 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_v2x.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_box_v2x.xml
@@ -3,13 +3,13 @@
     android:layout_width="804px"
     android:layout_height="160px"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="#1A2344"
+    android:background="#53000000"
     app:roundLayoutRadius="24px"
     android:layout_gravity="center_horizontal"
     android:layout_marginStart="30px"
     android:layout_marginEnd="30px"
-    android:layout_marginTop="5px"
-    android:layout_marginBottom="5px">
+    android:layout_marginTop="7px"
+    android:layout_marginBottom="7px">
 
     <ImageView
         android:id="@+id/ivV2XImage"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_operation.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_operation.xml
index 9f2c65b5b9..1a0cfc74d9 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_operation.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_operation.xml
@@ -3,13 +3,13 @@
     android:layout_width="804px"
     android:layout_height="160px"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="#1A2344"
+    android:background="#53000000"
     app:roundLayoutRadius="24px"
     android:layout_gravity="center_horizontal"
     android:layout_marginStart="30px"
     android:layout_marginEnd="30px"
-    android:layout_marginTop="5px"
-    android:layout_marginBottom="5px">
+    android:layout_marginTop="7px"
+    android:layout_marginBottom="7px">
 
     <ImageView
         android:id="@+id/ivBubbleOperationImage"
@@ -28,7 +28,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toRightOf="@id/ivBubbleOperationImage"
-        android:layout_marginTop="20px"
+        android:layout_marginTop="25px"
         android:layout_marginStart="25px"
         android:textColor="#FFFFFFFF"
         android:textSize="32px"
@@ -54,12 +54,12 @@
         app:layout_constraintLeft_toLeftOf="@id/tvBubbleOperationTitle"
         app:layout_constraintRight_toRightOf="@id/tvBubbleOperationTime"
         app:layout_constraintTop_toBottomOf="@id/tvBubbleOperationTitle"
-        android:layout_marginTop="10px"
         android:gravity="start"
         android:maxLines="2"
         android:ellipsize="end"
         android:textColor="#B3FFFFFF"
         android:textSize="28px"
+        android:lineSpacingMultiplier="1.2"
         />
 
 </com.mogo.eagle.core.widget.RoundConstraintLayout>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml
index ac166a81cf..7735a7139c 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_msg_bubble_report.xml
@@ -3,13 +3,13 @@
     android:layout_width="804px"
     android:layout_height="160px"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="#1A2344"
+    android:background="#53000000"
     app:roundLayoutRadius="24px"
     android:layout_gravity="center_horizontal"
     android:layout_marginStart="30px"
     android:layout_marginEnd="30px"
-    android:layout_marginTop="5px"
-    android:layout_marginBottom="5px"
+    android:layout_marginTop="7px"
+    android:layout_marginBottom="7px"
     >
 
     <ImageView
@@ -29,7 +29,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toRightOf="@id/ivBubbleReportImage"
-        android:layout_marginTop="20px"
+        android:layout_marginTop="15px"
         android:layout_marginStart="25px"
         android:textColor="#FFFFFFFF"
         android:textSize="32px"
@@ -54,7 +54,7 @@
         app:layout_constraintTop_toBottomOf="@id/tvBubbleReportTime"
         app:layout_constraintLeft_toLeftOf="@id/tvBubbleReportTime"
         app:layout_constraintRight_toRightOf="@id/tvBubbleReceiveTime"
-        android:layout_marginTop="5px"
+        android:layout_marginTop="6px"
         android:textColor="#B3FFFFFF"
         android:textSize="28px"
         android:maxLines="1"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_bubble.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_bubble.xml
index c6bc9596fa..e4d513a41b 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_bubble.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_driver_msg_box_bubble.xml
@@ -10,8 +10,8 @@
         android:id="@+id/rvBubbleList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingTop="15px"
-        android:paddingBottom="15px"
+        android:paddingTop="20px"
+        android:paddingBottom="20px"
         android:visibility="gone"
         />
 
diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/PermissionUtils.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/PermissionUtils.java
index 229b6dd5f8..5998a82b72 100755
--- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/PermissionUtils.java
+++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/PermissionUtils.java
@@ -499,10 +499,7 @@ public final class PermissionUtils {
             } else if (type == TYPE_DRAW_OVERLAYS) {
                 currentRequestCode = TYPE_DRAW_OVERLAYS;
                 startOverlayPermissionActivity(activity, TYPE_DRAW_OVERLAYS);
-            } else if (type == TYPE_ACCESS_FINE_LOCATION) {
-                currentRequestCode = TYPE_ACCESS_FINE_LOCATION;
-                startOverlayPermissionActivity(activity, TYPE_ACCESS_FINE_LOCATION);
-            } else {
+            }  else {
                 activity.finish();
                 Log.e("PermissionUtils", "type is wrong.");
             }