[290 taxi/bus司机端] badcase/ aicollect UI调整

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java

@@ -5,7 +5,6 @@ import static com.mogo.och.bus.constant.BusConst.TIMER_START_AUTOPILOT_INTERVAL;
 
 import android.animation.ObjectAnimator;
 import android.content.Intent;
-import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.animation.LinearInterpolator;
@@ -48,7 +47,6 @@ import com.mogo.och.bus.bean.BusRoutesResult;
 import com.mogo.och.bus.constant.BusConst;
 import com.mogo.och.bus.model.BusOrderModel;
 import com.mogo.och.bus.util.BDRouteDataTestUtils;
-import com.mogo.och.bus.view.BusArcView;
 import com.mogo.och.bus.view.SlidePanelView;
 
 import mogo.telematics.pad.MessagePad;
@@ -71,8 +69,8 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
     private TextView ctvAutopilotStatusTv;
     protected TextView tvOperationStatus;
     protected RelativeLayout mSettingBtn;
-    protected ImageView mBadcaseBtn;
+    protected RelativeLayout mBadcaseBtn;
-    protected ImageView mAISelectBtn;
+    protected RelativeLayout mAICollectBtn;
     public boolean isOperationStatus;//false-收车，true-出车
     private FrameLayout flStationPanelContainer;
     private Group groupTestPanel;
@@ -208,7 +206,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
         });
 
         // mBadcaseBtn的visible显示逻辑在showBadcaseEntrance内处理
-        mBadcaseBtn = findViewById(R.id.module_mogo_och_badcase_iv);
+        mBadcaseBtn = findViewById(R.id.module_mogo_och_badcase_rl);
 //        CallerHmiManager.INSTANCE.registerBadCaseCallback(
 //                () -> { // onShow()
 //                    return mBadcaseBtn; },
@@ -221,6 +219,11 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
                 CallerAutopilotRecordListenerManager.INSTANCE.addListener(TAG, this);
             }
         }
+
+        mAICollectBtn = findViewById(R.id.module_mogo_och_ai_collet_rl);
+        if (mAICollectBtn != null){
+            CallerDevaToolsManager.INSTANCE.initAiCollect(mAICollectBtn);
+        }
     }
 
     private void updateSwitchMapIcon(){

OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml

@@ -31,6 +31,7 @@
         app:layout_constraintTop_toBottomOf="@+id/fl_speed"
         android:background="@drawable/bus_autopilot_status_bg"
         app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginLeft="@dimen/dp_13"
         android:gravity="center"
         tools:visibility="visible" >
 
@@ -60,6 +61,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginLeft="@dimen/dp_13"
         app:layout_constraintTop_toBottomOf="@id/module_mogo_och_autopilot_status"
         app:layout_goneMarginTop="@dimen/module_mogo_och_station_panel_container_margin_top_no_call"
         tools:visibility="visible" />
@@ -128,26 +130,41 @@
             android:background="@drawable/bus_setting_btn_bg" />
     </RelativeLayout>
 
-    <ImageView
+    <RelativeLayout
-        android:id="@+id/module_mogo_och_badcase_iv"
+        android:id="@+id/module_mogo_och_badcase_rl"
         android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
         android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
         android:layout_marginLeft="@dimen/module_mogo_och_margin_left"
         android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
-        android:src="@drawable/bad_case_selector"
+        android:background="@drawable/bus_operation_status_bg"
         android:elevation="@dimen/dp_10"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/module_mogo_och_setting_layout"/>
+        app:layout_constraintLeft_toRightOf="@id/module_mogo_och_setting_layout">
-    <ImageView
+        <ImageView
-        android:id="@+id/module_mogo_och_ai_collet_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_gravity="center"
+            android:src="@drawable/bad_case_selector"/>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/module_mogo_och_ai_collet_rl"
         android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
         android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
         android:layout_marginLeft="@dimen/module_mogo_och_margin_left"
         android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
-        android:src="@drawable/ai_collect_selector"
         android:elevation="@dimen/dp_10"
+        android:background="@drawable/bus_operation_status_bg"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_iv"/>
+        app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_rl">
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ai_collect_selector"
+            android:layout_centerInParent="true"
+            android:layout_gravity="center"/>
+    </RelativeLayout>
 
     <com.mogo.och.bus.view.SlidePanelView
         android:id="@+id/module_mogo_och_slide_panel"

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java

@@ -77,8 +77,8 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
     private ImageView mCloseNaviIcon;
     protected LinearLayout mPersonalBtn;
     protected RelativeLayout mSettingBtn;
-    protected ImageView mBadcaseBtn;
+    protected LinearLayout mBadcaseBtn;
-    protected ImageView mAICollectBtn;
+    protected LinearLayout mAICollectBtn;
     protected TaxiNaviFragment ochNaviFragment = null;
     // protected TaxiTrafficLightView mTrafficLightView;
 
@@ -216,7 +216,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         });
 
         // mBadcaseBtn的visible显示逻辑在showBadcaseEntrance内处理
-        mBadcaseBtn = findViewById(R.id.module_och_taxi_badcase_iv);
+        mBadcaseBtn = findViewById(R.id.module_och_taxi_badcase_ll);
         if (mBadcaseBtn != null) {
             CallerDevaToolsManager.INSTANCE.initBadCase(mBadcaseBtn);
             if (!HmiBuildConfig.isShowBadCaseView) {
@@ -224,7 +224,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             }
         }
 
-        mAICollectBtn = findViewById(R.id.module_och_taxi_ai_collect_iv);
+        mAICollectBtn = findViewById(R.id.module_och_taxi_ai_collect_ll);
         if (mAICollectBtn != null){
             CallerDevaToolsManager.INSTANCE.initAiCollect(mAICollectBtn);
         }

OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml

@@ -152,11 +152,12 @@
         android:elevation="@dimen/dp_10"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_och_taxi_personal_layout">
+
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
             android:layout_centerInParent="true"
+            android:layout_gravity="center"
             android:background="@drawable/taxi_setting_btn_bg" />
     </RelativeLayout>
 
@@ -178,27 +179,42 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center" />
     </LinearLayout>
-    
+
-    <ImageView
+    <LinearLayout
-        android:id="@+id/module_och_taxi_badcase_iv"
+        android:id="@+id/module_och_taxi_badcase_ll"
         android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
         android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
         android:layout_marginLeft="40px"
         android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
-        android:src="@drawable/bad_case_selector"
         android:elevation="@dimen/dp_10"
+        android:background="@drawable/taxi_operation_status_bg"
+        android:gravity="center"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/module_och_taxi_swich_map_layout"/>
+        app:layout_constraintLeft_toRightOf="@id/module_och_taxi_swich_map_layout">
-    <ImageView
+        <ImageView
-        android:id="@+id/module_och_taxi_ai_collect_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@drawable/bad_case_selector"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/module_och_taxi_ai_collect_ll"
         android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
         android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
         android:layout_marginLeft="40px"
         android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
-        android:src="@drawable/ai_collect_selector"
         android:elevation="@dimen/dp_10"
+        android:gravity="center"
+        android:background="@drawable/taxi_operation_status_bg"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_iv"/>
+        app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_ll">
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@drawable/ai_collect_selector"/>
+    </LinearLayout>
 
     <Button
         android:id="@+id/btnAutopilotDisable"