[6.4.0]

[bus 页面调整]

OCH/bus/driver/src/main/res/layout/bug_fragment_och.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/module_och_bus_order_status_stationInfo"
-    android:layout_width="@dimen/module_mogo_och_autopilot_order_bg_width"
+    android:layout_width="@dimen/dp_616"
     android:layout_height="wrap_content"
     android:paddingBottom="@dimen/dp_28"
     android:background="@drawable/bus_line_panel_bg"
@@ -96,8 +96,9 @@
         android:id="@+id/switch_line_btn"
         android:layout_width="@dimen/bus_switch_line_btn_width_1"
         android:layout_height="@dimen/bus_switch_line_btn_height_1"
-        android:layout_marginLeft="@dimen/dp_28"
         android:layout_marginTop="@dimen/dp_40"
+        android:layout_marginStart="@dimen/dp_29"
+        android:layout_marginEnd ="@dimen/dp_27"
         app:layout_goneMarginTop="@dimen/dp_600"
         android:background="@drawable/bus_switch_line_btn"
         android:gravity="center"

OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml

@@ -37,7 +37,7 @@
 <!--    </FrameLayout>-->
     <FrameLayout
         android:id="@+id/fl_speed"
-        android:layout_width="@dimen/dp_624"
+        android:layout_width="@dimen/dp_618"
         android:layout_height="@dimen/dp_269"
         android:layout_marginStart="@dimen/dp_10"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -170,9 +170,10 @@
 
     <RelativeLayout
         android:id="@+id/module_mogo_och_autopilot_status"
-        android:layout_width="@dimen/module_mogo_och_autopilot_status_bg_width"
-        android:layout_height="@dimen/module_mogo_och_autopilot_status_bg_height"
-        android:layout_marginLeft="@dimen/dp_13"
+        android:layout_width="@dimen/dp_616"
+        android:layout_height="@dimen/dp_180"
+        android:layout_marginStart="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_m_1"
         android:background="@drawable/bus_autopilot_0_1_status_bg"
         android:gravity="center"
         app:layout_constraintLeft_toLeftOf="parent"

OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/errorview/ErrorInfoView.kt

@@ -112,7 +112,11 @@ class ErrorInfoView : ConstraintLayout, ErrorInfoViewModel.IErrorInfoViewCallbac
 
     fun showErrinfo(errorInfo: String) {
         actv_error_head?.text = errorInfo
-        actv_error_body?.text = "${FlavorUtils.getInfo()} 司机SN:${LoginLanPassengerSocket.driverSn}"
+        if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
+            actv_error_body?.text = FlavorUtils.getInfo()
+        }else  if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
+            actv_error_body?.text = "${FlavorUtils.getInfo()} 司机SN:${LoginLanPassengerSocket.driverSn}"
+        }
     }
 
 }