diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index aaa13e9e27..df8826cbec 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/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 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 // 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 } } + @Override + public void onAutopilotRecordConfig(@NonNull MessagePad.RecordDataConfig config) { + } /** * 测试到站 diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_badcase_btn_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_badcase_btn_bg.png deleted file mode 100644 index 89a6eaa5dc..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_badcase_btn_bg.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png new file mode 100755 index 0000000000..9232e2c15a Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png new file mode 100755 index 0000000000..04a1e40e8d Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png new file mode 100755 index 0000000000..528e4e0698 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png new file mode 100755 index 0000000000..73a7e82fbb Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_badcase_btn_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_badcase_btn_bg.png deleted file mode 100644 index 89a6eaa5dc..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/bus_badcase_btn_bg.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png new file mode 100755 index 0000000000..9232e2c15a Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png new file mode 100755 index 0000000000..04a1e40e8d Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png new file mode 100755 index 0000000000..528e4e0698 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png new file mode 100755 index 0000000000..73a7e82fbb Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_badcase_btn_bg.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_badcase_btn_bg.png deleted file mode 100644 index 89a6eaa5dc..0000000000 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/bus_badcase_btn_bg.png and /dev/null differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_normal.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_normal.png new file mode 100755 index 0000000000..9232e2c15a Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_normal.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_select.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_select.png new file mode 100755 index 0000000000..04a1e40e8d Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_select.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case_normal.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case_normal.png new file mode 100755 index 0000000000..528e4e0698 Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case_normal.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case_select.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case_select.png new file mode 100755 index 0000000000..73a7e82fbb Binary files /dev/null and b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case_select.png differ diff --git a/OCH/mogo-och-bus/src/main/res/drawable/ai_collect_selector.xml b/OCH/mogo-och-bus/src/main/res/drawable/ai_collect_selector.xml new file mode 100755 index 0000000000..879be14e27 --- /dev/null +++ b/OCH/mogo-och-bus/src/main/res/drawable/ai_collect_selector.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/drawable/bad_case_selector.xml b/OCH/mogo-och-bus/src/main/res/drawable/bad_case_selector.xml new file mode 100755 index 0000000000..b0e7932bd4 --- /dev/null +++ b/OCH/mogo-och-bus/src/main/res/drawable/bad_case_selector.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml index 461842718e..0551f1dd74 100644 --- a/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml +++ b/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"> - + @@ -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"/> + - - - - - - - - - \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index c033d594e5..17cc3cae09 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/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 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 { AIAssist.getInstance(getContext()).speakTTSVoice(notice); diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png new file mode 100755 index 0000000000..9232e2c15a Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png new file mode 100755 index 0000000000..04a1e40e8d Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png new file mode 100755 index 0000000000..528e4e0698 Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png new file mode 100755 index 0000000000..73a7e82fbb Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_badcase_btn_bg.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_badcase_btn_bg.png deleted file mode 100644 index 89a6eaa5dc..0000000000 Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_badcase_btn_bg.png and /dev/null differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png new file mode 100755 index 0000000000..9232e2c15a Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png new file mode 100755 index 0000000000..04a1e40e8d Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png new file mode 100755 index 0000000000..528e4e0698 Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png new file mode 100755 index 0000000000..73a7e82fbb Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_badcase_btn_bg.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_badcase_btn_bg.png deleted file mode 100644 index 89a6eaa5dc..0000000000 Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1600/taxi_badcase_btn_bg.png and /dev/null differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal.png new file mode 100755 index 0000000000..9232e2c15a Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_normal.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select.png new file mode 100755 index 0000000000..04a1e40e8d Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_ai_select.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal.png new file mode 100755 index 0000000000..528e4e0698 Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_normal.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select.png new file mode 100755 index 0000000000..73a7e82fbb Binary files /dev/null and b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/icon_bad_case_select.png differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_badcase_btn_bg.png b/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_badcase_btn_bg.png deleted file mode 100644 index 89a6eaa5dc..0000000000 Binary files a/OCH/mogo-och-taxi/src/main/res/drawable-xhdpi/taxi_badcase_btn_bg.png and /dev/null differ diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector.xml b/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector.xml new file mode 100755 index 0000000000..879be14e27 --- /dev/null +++ b/OCH/mogo-och-taxi/src/main/res/drawable/ai_collect_selector.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector.xml b/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector.xml new file mode 100755 index 0000000000..b0e7932bd4 --- /dev/null +++ b/OCH/mogo-och-taxi/src/main/res/drawable/bad_case_selector.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml index 1b1b51a117..9410f9d8bc 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml +++ b/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"> - - +