[282 bus/taxi] bus/taxi司机端更改badcase,增加ai collect

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

@@ -15,6 +15,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.Group;
 
@@ -49,6 +50,7 @@ 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;
 import record_cache.RecordPanelOuterClass;
 
 /**
@@ -69,6 +71,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
     protected TextView tvOperationStatus;
     protected RelativeLayout mSettingBtn;
     protected ImageView mBadcaseBtn;
+    protected ImageView mAISelectBtn;
     public boolean isOperationStatus;//false-收车，true-出车
     private FrameLayout flStationPanelContainer;
     private Group groupTestPanel;
@@ -204,21 +207,17 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
 
         // mBadcaseBtn的visible显示逻辑在showBadcaseEntrance内处理
         mBadcaseBtn = findViewById(R.id.module_mogo_och_badcase_iv);
-//        CallerHmiManager.INSTANCE.registerBadCaseCallback(
-//                () -> { // onShow()
-//                    return mBadcaseBtn; },
-//                () -> { // onHide()
-//                    return null; });
-
         if (mBadcaseBtn != null) {
-            CallerDevaToolsManager.INSTANCE.initBadCase(mBadcaseBtn, null, null);
+            CallerDevaToolsManager.INSTANCE.initBadCase(mBadcaseBtn);
             if (!HmiBuildConfig.isShowBadCaseView) {
                 CallerAutopilotRecordListenerManager.INSTANCE.addListener(TAG, this);
             }
         }
-        //设置升级小红点提示 默认隐藏
-        mUpgradeTipIv = findViewById(R.id.module_och_bus_upgrade_red_tip);
-        CallerHmiManager.INSTANCE.registerUpgradeTipsCallback(() -> mUpgradeTipIv);
+
+        mAISelectBtn = findViewById(R.id.module_mogo_och_ai_collet_iv);
+        if (mAISelectBtn != null){
+            CallerDevaToolsManager.INSTANCE.initAiCollect(mAISelectBtn);
+        }
     }
 
     private void updateSwitchMapIcon(){
@@ -251,6 +250,9 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
         }
     }
 
+    @Override
+    public void onAutopilotRecordConfig(@NonNull MessagePad.RecordDataConfig config) {
+    }
 
     /**
      * 测试到站

OCH/mogo-och-bus/src/main/res/drawable/ai_collect_selector.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_ai_select" android:state_focused="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/icon_ai_select" android:state_focused="false" android:state_pressed="true" />
+    <item android:drawable="@drawable/icon_ai_select" android:state_selected="true" />
+    <item android:drawable="@drawable/icon_ai_select" android:state_focused="true" />
+    <item android:drawable="@drawable/icon_ai_normal" />
+</selector>

OCH/mogo-och-bus/src/main/res/drawable/bad_case_selector.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_bad_case_select" android:state_focused="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/icon_bad_case_select" android:state_focused="false" android:state_pressed="true" />
+    <item android:drawable="@drawable/icon_bad_case_select" android:state_selected="true" />
+    <item android:drawable="@drawable/icon_bad_case_select" android:state_focused="true" />
+    <item android:drawable="@drawable/icon_bad_case_normal" />
+</selector>

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

@@ -126,21 +126,12 @@
         android:elevation="@dimen/dp_10"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/bus_switch_model_layout">
-        <ImageView
-            android:id="@+id/module_och_bus_upgrade_red_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
-            android:layout_gravity="right"
-            android:visibility="gone"
-            android:elevation="8px"
-            android:background="@drawable/bus_setting_tip_red_cir_bg" />
+
         <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/bus_setting_btn_bg" />
     </RelativeLayout>
 
@@ -150,11 +141,20 @@
         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/bus_badcase_btn_bg"
+        android:src="@drawable/bad_case_selector"
         android:elevation="@dimen/dp_10"
-        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_mogo_och_setting_layout"/>
+    <ImageView
+        android:id="@+id/module_mogo_och_ai_collet_iv"
+        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"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_iv"/>
 
     <com.mogo.och.bus.view.SlidePanelView
         android:id="@+id/module_mogo_och_slide_panel"
@@ -232,13 +232,4 @@
         ,btnAutopilotRunning,btnAutopilotRoute"
         tools:visibility="visible" />
 
-<!--    <com.mogo.och.bus.ui.BusTrafficLightView-->
-<!--        android:id="@+id/bus_traffic_light_view"-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        app:layout_constraintRight_toRightOf="parent"-->
-<!--        app:layout_constraintTop_toTopOf="parent"-->
-<!--        android:layout_marginRight="@dimen/bus_traffic_light_layout_margin_right"-->
-<!--        android:layout_marginTop="@dimen/bus_traffic_light_layout_margin_top"-->
-<!--        android:visibility="gone"/>-->
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -15,6 +15,7 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.Group;
 import androidx.fragment.app.FragmentTransaction;
@@ -44,6 +45,7 @@ import com.mogo.module.common.view.OnPreventFastClickListener;
 import com.mogo.och.taxi.R;
 import com.mogo.och.taxi.constant.TaxiConst;
 
+import mogo.telematics.pad.MessagePad;
 import record_cache.RecordPanelOuterClass;
 
 
@@ -73,6 +75,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
     protected LinearLayout mPersonalBtn;
     protected RelativeLayout mSettingBtn;
     protected ImageView mBadcaseBtn;
+    protected ImageView mAICollectBtn;
     protected ImageView mUpgradeTipIv;
     protected TaxiNaviFragment ochNaviFragment = null;
     // protected TaxiTrafficLightView mTrafficLightView;
@@ -156,15 +159,16 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         // mBadcaseBtn的visible显示逻辑在showBadcaseEntrance内处理
         mBadcaseBtn = findViewById(R.id.module_och_taxi_badcase_iv);
         if (mBadcaseBtn != null) {
-            CallerDevaToolsManager.INSTANCE.initBadCase(mBadcaseBtn, null, null);
+            CallerDevaToolsManager.INSTANCE.initBadCase(mBadcaseBtn);
             if (!HmiBuildConfig.isShowBadCaseView) {
                 CallerAutopilotRecordListenerManager.INSTANCE.addListener(TAG, this);
             }
         }
 
-        //设置升级小红点提示 默认隐藏
-        mUpgradeTipIv = findViewById(R.id.module_och_taxi_upgrade_red_tip);
-        CallerHmiManager.INSTANCE.registerUpgradeTipsCallback(() -> mUpgradeTipIv);
+        mAICollectBtn = findViewById(R.id.module_och_taxi_ai_collect_iv);
+        if (mAICollectBtn != null){
+            CallerDevaToolsManager.INSTANCE.initAiCollect(mAICollectBtn);
+        }
 
         panelView = LayoutInflater.from(getContext()).inflate(getStationPanelViewId(), flStationPanelContainer);
         ctvAutopilotStatus.setOnClickListener(new OnPreventFastClickListener() {
@@ -255,6 +259,10 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         }
     }
 
+    @Override
+    public void onAutopilotRecordConfig(@NonNull MessagePad.RecordDataConfig config) {
+    }
+
     public void showNotice(String notice) {
         getActivity().runOnUiThread(() -> {
             AIAssist.getInstance(getContext()).speakTTSVoice(notice);

OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_ai_select" android:state_focused="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/icon_ai_select" android:state_focused="false" android:state_pressed="true" />
+    <item android:drawable="@drawable/icon_ai_select" android:state_selected="true" />
+    <item android:drawable="@drawable/icon_ai_select" android:state_focused="true" />
+    <item android:drawable="@drawable/icon_ai_normal" />
+</selector>

OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_bad_case_select" android:state_focused="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/icon_bad_case_select" android:state_focused="false" android:state_pressed="true" />
+    <item android:drawable="@drawable/icon_bad_case_select" android:state_selected="true" />
+    <item android:drawable="@drawable/icon_bad_case_select" android:state_focused="true" />
+    <item android:drawable="@drawable/icon_bad_case_normal" />
+</selector>

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

@@ -145,17 +145,6 @@
         android:elevation="@dimen/dp_10"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_och_taxi_personal_layout">
-        <ImageView
-            android:id="@+id/module_och_taxi_upgrade_red_tip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
-            android:layout_gravity="right"
-            android:visibility="gone"
-            android:elevation="8px"
-            android:background="@drawable/taxi_setting_tip_red_cir_bg" />
-
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -189,11 +178,20 @@
         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/taxi_badcase_btn_bg"
+        android:src="@drawable/bad_case_selector"
         android:elevation="@dimen/dp_10"
-        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toRightOf="@id/module_och_taxi_swich_map_layout"/>
+    <ImageView
+        android:id="@+id/module_och_taxi_ai_collect_iv"
+        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"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_iv"/>
 
     <Button
         android:id="@+id/btnAutopilotDisable"
@@ -251,13 +249,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         android:src="@drawable/taxi_close_navi_icon"/>
 
-<!--    <com.mogo.och.taxi.ui.TaxiTrafficLightView-->
-<!--        android:id="@+id/taxi_traffic_light_view"-->
-<!--        android:layout_width="wrap_content"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        app:layout_constraintRight_toRightOf="parent"-->
-<!--        app:layout_constraintTop_toTopOf="parent"-->
-<!--        android:layout_marginRight="@dimen/taxi_traffic_light_layout_margin_right"-->
-<!--        android:layout_marginTop="@dimen/taxi_traffic_light_layout_margin_top"-->
-<!--        android:visibility="gone"/>-->
 </androidx.constraintlayout.widget.ConstraintLayout>