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 5162de652c..c83715f9f1 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 @@ -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 private TextView ctvAutopilotStatusTv; protected TextView tvOperationStatus; protected RelativeLayout mSettingBtn; - protected ImageView mBadcaseBtn; - protected ImageView mAISelectBtn; + protected RelativeLayout mBadcaseBtn; + protected RelativeLayout mAICollectBtn; public boolean isOperationStatus;//false-收车,true-出车 private FrameLayout flStationPanelContainer; private Group groupTestPanel; @@ -208,7 +206,7 @@ public abstract class BaseBusTabFragment }); // 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 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(){ 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 index 9232e2c15a..e98738b192 100755 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_ai_normal.png 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 index 04a1e40e8d..d3e0107c02 100755 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_ai_select.png 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 index 528e4e0698..c0a978fc2b 100755 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_normal.png 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 index 73a7e82fbb..ebacf3a11a 100755 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/icon_bad_case_select.png 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/icon_ai_normal.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png index 9232e2c15a..e98738b192 100755 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_normal.png 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 index 04a1e40e8d..d3e0107c02 100755 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_ai_select.png 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 index 528e4e0698..c0a978fc2b 100755 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_normal.png 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 index 73a7e82fbb..ebacf3a11a 100755 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1600/icon_bad_case_select.png 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/icon_ai_normal.png b/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_normal.png index 9232e2c15a..e98738b192 100755 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_normal.png 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 index 04a1e40e8d..d3e0107c02 100755 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_ai_select.png 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 index 528e4e0698..c0a978fc2b 100755 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case_normal.png 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 index 73a7e82fbb..ebacf3a11a 100755 Binary files a/OCH/mogo-och-bus/src/main/res/drawable-xhdpi/icon_bad_case_select.png 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/layout/bus_base_fragment.xml b/OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml index e4dabdb000..d7c90ab082 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 @@ -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" /> - - + + + + + app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_rl"> + + + @@ -178,27 +179,42 @@ android:layout_height="wrap_content" android:layout_gravity="center" /> - - - + + + + + app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_ll"> + +