diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java index b355ea73b8..3cce3b4e9d 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java @@ -11,7 +11,6 @@ import android.view.ViewGroup; import android.view.animation.LinearInterpolator; import android.widget.FrameLayout; import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.RelativeLayout; import android.widget.TextView; @@ -26,21 +25,13 @@ import com.mogo.commons.mvp.Presenter; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; -import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager; import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager; -import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxBubbleView; import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxButtonView; import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxListView; -import com.mogo.eagle.core.function.hmi.ui.widget.TrafficDataView; import com.mogo.eagle.core.function.smp.view.SmallMapView; -import com.mogo.eagle.core.function.view.MapBizView; import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.map.listener.IMogoMapListener; -import com.mogo.map.listener.MogoMapListenerHandler; -import com.mogo.map.uicontroller.IMogoMapUIController; -import com.mogo.map.uicontroller.VisualAngleMode; import com.mogo.och.bus.R; import com.mogo.och.bus.bean.BusRoutesResult; import com.mogo.och.bus.model.OrderModel; @@ -52,10 +43,6 @@ import com.mogo.och.common.module.utils.ResourcesUtils; import org.greenrobot.eventbus.EventBus; -import bag_manager.BagManagerOuterClass; -import mogo.telematics.pad.MessagePad; -import record_cache.RecordPanelOuterClass; - /** * 网约车基础Fragment，主要负责布局通用界面，处理站点面板和通话面板互斥情况 *

@@ -63,7 +50,7 @@ import record_cache.RecordPanelOuterClass; * * @author tongchenfei */ -public abstract class BaseBusTabFragment> extends MvpFragment implements IMogoMapListener { +public abstract class BaseBusTabFragment> extends MvpFragment { private static final String TAG = "BaseBusTabFragment"; @@ -72,17 +59,9 @@ public abstract class BaseBusTabFragment private ImageView ctvAutopilotStatusIv; private TextView ctvAutopilotStatusTv; protected TextView tvArrived; - protected RelativeLayout mSettingBtn; - protected RelativeLayout mBadcaseBtn; private FrameLayout flStationPanelContainer; private BizMapView mapBizView; private Group groupTestPanel; -// private TrafficDataView mTrafficDataView; - // private BusTrafficLightView mTrafficLightView; - - //远景和中景的切换 - private ImageView mSwitchMapModeImage; - private LinearLayout mSwitchMapModeLayout; protected SmallMapView smallMapView; @@ -140,34 +119,6 @@ public abstract class BaseBusTabFragment LayoutInflater.from(getContext()).inflate(getStationPanelViewId(), flStationPanelContainer); slidePanelView.setOnSlidePanelMoveToEndListener(onSlideToEndListener); - mSwitchMapModeLayout = findViewById(R.id.bus_switch_model_layout); - mSwitchMapModeImage = findViewById(R.id.bus_switch_model_icon); - updateSwitchMapIcon(); - - mSwitchMapModeLayout.setOnClickListener(new OnPreventFastClickListener() { - @Override - public void onClickImpl(View v) { - if(mapBizView != null){ - IMogoMapUIController uiController = mapBizView.getUI(); - if(uiController != null){ - //切换地图的远近视图 - if (uiController.getCurrentMapVisualAngle().isLongSight()) { - uiController.setLockMode(true); - uiController.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null); - mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium); - } else if (uiController.getCurrentMapVisualAngle().isMediumSight()) { - uiController.setLockMode(false); - uiController.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null); - mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_long); - } else { - uiController.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null); - mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium); - } - } - } - } - }); - initListener(); setAutopilotBtnStatus(CallerAutoPilotStatusListenerManager.INSTANCE.getState(), CallerAutoPilotControlManager.INSTANCE.isCanStartAutopilot(false, 0)); ctvAutopilotStatus.setOnClickListener(new OnPreventFastClickListener() { @@ -208,18 +159,6 @@ public abstract class BaseBusTabFragment onArriveStation(); }); - mSettingBtn = findViewById(R.id.module_mogo_och_setting_layout); - mSettingBtn.setOnClickListener(v -> { - CallerHmiManager.INSTANCE.showToolsView(); - }); - - // mBadcaseBtn的visible显示逻辑在showBadcaseEntrance内处理 - mBadcaseBtn = findViewById(R.id.module_mogo_och_badcase_rl); - - if (mBadcaseBtn != null) { - CallerDevaToolsManager.INSTANCE.reportWorkOrder(mBadcaseBtn); - } - //消息盒子 viewDriverMsgBoxButton = findViewById(R.id.viewDriverMsgBoxButton); viewDriverMsgBoxList = findViewById(R.id.viewDriverMsgBoxList); @@ -264,21 +203,6 @@ public abstract class BaseBusTabFragment protected abstract void onArriveStation(); - private void updateSwitchMapIcon() { - if(mapBizView != null){ - IMogoMapUIController uiController = mapBizView.getUI(); - if(uiController != null){ - if (uiController.getCurrentMapVisualAngle().isLongSight()) { - mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_long); - } else if (uiController.getCurrentMapVisualAngle().isMediumSight()) { - mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium); - } else { - mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium); - } - } - } - } - private void debugArrivedRoute() { BDRouteDataTestUtils.converToRouteData(); } @@ -308,7 +232,6 @@ public abstract class BaseBusTabFragment if(smallMapView != null){ smallMapView.onDestroy(); } - CallerAutopilotRecordListenerManager.INSTANCE.removeListener(TAG); EventBus.getDefault().unregister(this); super.onDestroyView(); } @@ -319,7 +242,6 @@ public abstract class BaseBusTabFragment protected abstract void debugArrivedStation(); private void initListener() { - MogoMapListenerHandler.Companion.getMogoMapListenerHandler().registerHostMapListener(TAG, this); } /** @@ -539,31 +461,9 @@ public abstract class BaseBusTabFragment } } -// /** -// * 迈速表实时更新 -// */ -// public void updateSpeedView(float newSpeed) { -// int speed = (int) (Math.abs(newSpeed) * 3.6F); // 倒车时工控机反馈定位信息中speed为负值 -// if (mTrafficDataView != null) { -// mTrafficDataView.updateSpeedWithValue(speed); -// } -// } - @Override public void onDestroy() { super.onDestroy(); - MogoMapListenerHandler.Companion.getMogoMapListenerHandler().unregisterHostMapListener(TAG); - } - - @Override - public void onMapVisualAngleChanged(VisualAngleMode visualAngleMode) { - if (visualAngleMode.isMediumSight()) { - mSwitchMapModeLayout.setVisibility(View.VISIBLE); - } else if (visualAngleMode.isLongSight()) { - mSwitchMapModeLayout.setVisibility(View.VISIBLE); - } else if (visualAngleMode.isCloseSight()) { - mSwitchMapModeLayout.setVisibility(View.GONE); - } } /** diff --git a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_autopilot_status_bg_check.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_autopilot_status_bg_check.png deleted file mode 100644 index 28857974b5..0000000000 Binary files a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_autopilot_status_bg_check.png and /dev/null differ diff --git a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_autopilot_status_bg_nor.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_autopilot_status_bg_nor.png deleted file mode 100644 index f7d4f92c4b..0000000000 Binary files a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_autopilot_status_bg_nor.png and /dev/null differ diff --git a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_icon_in_autopilot.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_icon_in_autopilot.png deleted file mode 100644 index 75c26c3d71..0000000000 Binary files a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_icon_in_autopilot.png and /dev/null differ diff --git a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_icon_not_in_autopilot.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_icon_not_in_autopilot.png deleted file mode 100644 index 927296d690..0000000000 Binary files a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_icon_not_in_autopilot.png and /dev/null differ diff --git a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_notice_box_bg.9.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_notice_box_bg.9.png deleted file mode 100644 index 8b4b579b56..0000000000 Binary files a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_base_notice_box_bg.9.png and /dev/null differ diff --git a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_setting_btn_bg.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_setting_btn_bg.png deleted file mode 100644 index ba41bf3a53..0000000000 Binary files a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_setting_btn_bg.png and /dev/null differ diff --git a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_switch_map_long.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_switch_map_long.png deleted file mode 100755 index cf3e5a3778..0000000000 Binary files a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_switch_map_long.png and /dev/null differ diff --git a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_switch_map_medium.png b/OCH/bus/driver/src/main/res/drawable-nodpi/bus_switch_map_medium.png deleted file mode 100755 index bdc2725468..0000000000 Binary files a/OCH/bus/driver/src/main/res/drawable-nodpi/bus_switch_map_medium.png and /dev/null differ diff --git a/OCH/bus/driver/src/main/res/drawable-nodpi/icon_ai_collect.png b/OCH/bus/driver/src/main/res/drawable-nodpi/icon_ai_collect.png deleted file mode 100755 index 6da7b81fe4..0000000000 Binary files a/OCH/bus/driver/src/main/res/drawable-nodpi/icon_ai_collect.png and /dev/null differ diff --git a/OCH/bus/driver/src/main/res/drawable-nodpi/pingxingjiashi.png b/OCH/bus/driver/src/main/res/drawable-nodpi/pingxingjiashi.png deleted file mode 100644 index 78bfa2687f..0000000000 Binary files a/OCH/bus/driver/src/main/res/drawable-nodpi/pingxingjiashi.png and /dev/null differ diff --git a/OCH/bus/driver/src/main/res/drawable-nodpi/press_start_status.png b/OCH/bus/driver/src/main/res/drawable-nodpi/press_start_status.png deleted file mode 100755 index af32c20cb5..0000000000 Binary files a/OCH/bus/driver/src/main/res/drawable-nodpi/press_start_status.png and /dev/null differ diff --git a/OCH/bus/driver/src/main/res/drawable-nodpi/start_failure.png b/OCH/bus/driver/src/main/res/drawable-nodpi/start_failure.png deleted file mode 100755 index 5737f93ad8..0000000000 Binary files a/OCH/bus/driver/src/main/res/drawable-nodpi/start_failure.png and /dev/null differ diff --git a/OCH/bus/driver/src/main/res/drawable-nodpi/start_maker_icon.png b/OCH/bus/driver/src/main/res/drawable-nodpi/start_maker_icon.png deleted file mode 100644 index 9eca61e199..0000000000 Binary files a/OCH/bus/driver/src/main/res/drawable-nodpi/start_maker_icon.png and /dev/null differ diff --git a/OCH/bus/driver/src/main/res/drawable-nodpi/start_success.png b/OCH/bus/driver/src/main/res/drawable-nodpi/start_success.png deleted file mode 100755 index 84246fd323..0000000000 Binary files a/OCH/bus/driver/src/main/res/drawable-nodpi/start_success.png and /dev/null differ diff --git a/OCH/bus/driver/src/main/res/drawable/ai_collect_selector.xml b/OCH/bus/driver/src/main/res/drawable/ai_collect_selector.xml deleted file mode 100755 index a1211f3c47..0000000000 --- a/OCH/bus/driver/src/main/res/drawable/ai_collect_selector.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/bus/driver/src/main/res/drawable/bad_case_selector.xml b/OCH/bus/driver/src/main/res/drawable/bad_case_selector.xml deleted file mode 100755 index bc47ce95d7..0000000000 --- a/OCH/bus/driver/src/main/res/drawable/bad_case_selector.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/OCH/bus/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml b/OCH/bus/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml deleted file mode 100644 index 94555d78cc..0000000000 --- a/OCH/bus/driver/src/main/res/drawable/bus_base_autopilot_status_icon_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml index 2462451fb7..4d1d290128 100644 --- a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml +++ b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml @@ -6,11 +6,13 @@ android:layout_height="match_parent" android:layout_marginTop="@dimen/dp_72"> + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - + app:layout_constraintLeft_toRightOf="@id/module_mogo_och_arrived_tv" + android:layout_width="@dimen/dp_142" + android:layout_height="@dimen/dp_142"/> - - - - + + app:layout_constraintLeft_toRightOf="@id/toolsView" + android:layout_marginStart="-10dp" + android:layout_marginBottom="@dimen/dp_17" + android:layout_width="@dimen/dp_142" + android:layout_height="@dimen/dp_142"/> - - - + + + ?>() : - MvpFragment(), IMogoMapListener, IMoGoAutopilotRecordListener { + MvpFragment() { private val TAG = "BaseBusTabFragment" private var ctvAutopilotStatus: AutopilotStatusView? = null - protected var mSettingBtn: RelativeLayout? = null - protected var mBadcaseBtn: RelativeLayout? = null - protected var mAICollectBtn: RelativeLayout? = null private var flStationPanelContainer: FrameLayout? = null private var mapBizView: MapBizView? = null private var groupTestPanel: Group? = null protected var slidePanelView: SlidePanelView? = null - //远景和中景的切换 - private var mSwitchMapModeImage: ImageView? = null - private var mSwitchMapModeLayout: LinearLayout? = null protected var smallMapView: SmallMapView? = null @@ -90,36 +73,13 @@ abstract class CharterBaseFragment?>() : slidePanelView?.setOnSlidePanelMoveToEndListener(onSlideToEndListener) - // mTrafficDataView = (TrafficDataView) findViewById(R.id.bus_arc); val flSpeed = findViewById(R.id.fl_speed) if (flSpeed != null) { attachAutopilotBeforeLaunchView(flSpeed.context, flSpeed) } LayoutInflater.from(context).inflate(getStationPanelViewId(), flStationPanelContainer) - mSwitchMapModeLayout = findViewById(R.id.bus_switch_model_layout) - mSwitchMapModeImage = findViewById(R.id.bus_switch_model_icon) - updateSwitchMapIcon() - mSwitchMapModeLayout!!.setOnClickListener(object : OnPreventFastClickListener() { - override fun onClickImpl(v: View) { - mapBizView?.let { - it.getUI()?.let { ui -> - if (ui.currentMapVisualAngle.isLongSight) { - ui.setLockMode(true) - ui.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null) - mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_medium) - } else if (ui.currentMapVisualAngle.isMediumSight) { - ui.setLockMode(false) - ui.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null) - mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_long) - } else { - ui.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null) - mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_medium) - } - } - } - } - }) + initListener() // 模拟 不可自动驾驶，目前场景是刚开机，adas还未和工控机连接 @@ -153,21 +113,6 @@ abstract class CharterBaseFragment?>() : onArriveStation() } - mSettingBtn = findViewById(R.id.module_mogo_och_setting_layout) - mSettingBtn!!.setOnClickListener { v: View? -> - showToolsView() - } - - // mBadcaseBtn的visible显示逻辑在showBadcaseEntrance内处理 - mBadcaseBtn = findViewById(R.id.module_mogo_och_badcase_rl) - if (mBadcaseBtn != null) { - reportWorkOrder(mBadcaseBtn!!) - CallerAutopilotRecordListenerManager.addListener(TAG, this) - } - mAICollectBtn = findViewById(R.id.module_mogo_och_ai_collet_rl) - if (mAICollectBtn != null) { - initAiCollect(mAICollectBtn!!) - } //消息盒子 viewDriverMsgBoxButton = findViewById(R.id.viewDriverMsgBoxButton) viewDriverMsgBoxList = findViewById(R.id.viewDriverMsgBoxList) @@ -260,20 +205,6 @@ abstract class CharterBaseFragment?>() : requireActivity().runOnUiThread { slidePanelView?.visibility = View.GONE } } - private fun updateSwitchMapIcon() { - mapBizView?.let { - it.getUI()?.let { ui -> - if (ui.currentMapVisualAngle.isLongSight) { - mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_long) - } else if (ui.currentMapVisualAngle.isMediumSight) { - mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_medium) - } else { - mSwitchMapModeImage!!.setImageResource(R.drawable.charter_switch_map_medium) - } - } - } - } - override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) mapBizView!!.onSaveInstanceState(outState) @@ -299,7 +230,6 @@ abstract class CharterBaseFragment?>() : } private fun initListener() { - mogoMapListenerHandler.registerHostMapListener(TAG, this) } @@ -334,17 +264,6 @@ abstract class CharterBaseFragment?>() : override fun onDestroy() { super.onDestroy() - mogoMapListenerHandler.unregisterHostMapListener(TAG) - } - - override fun onMapVisualAngleChanged(visualAngleMode: VisualAngleMode) { - if (visualAngleMode.isMediumSight) { - mSwitchMapModeLayout!!.visibility = View.VISIBLE - } else if (visualAngleMode.isLongSight) { - mSwitchMapModeLayout!!.visibility = View.VISIBLE - } else if (visualAngleMode.isCloseSight) { - mSwitchMapModeLayout!!.visibility = View.GONE - } } /** @@ -370,43 +289,6 @@ abstract class CharterBaseFragment?>() : private var stopMd5TV: TextView? = null private var trajMd5DPQPTV: TextView? = null private var stopMd5DPQPTV: TextView? = null - -// open fun showHideTestBar() { -// if (busTestBar == null) { -// busTestBar = findViewById(R.id.module_mogo_och_bus_test_bar) -// lineIdTV = findViewById(R.id.bus_test_bar_current_line_id) -// trajMd5TV = findViewById(R.id.bus_test_bar_current_traj_md5) -// stopMd5TV = findViewById(R.id.bus_test_bar_current_stop_md5) -// trajMd5DPQPTV = findViewById(R.id.bus_test_bar_current_traj_md5_dpqp) -// stopMd5DPQPTV = findViewById(R.id.bus_test_bar_current_stop_md5_dpqp) -// } -// if (busTestBar!!.visibility == View.VISIBLE) { -// busTestBar!!.visibility = View.GONE -// } else { -// val routesResult: BusRoutesResult = BusOrderModel.getInstance().getBusRoutesResult() -// lineIdTV!!.text = "lineId:" + (routesResult.lineId.toString() ?: "") -// trajMd5TV!!.text = "TMd5:" + routesResult.csvFileMd5 -// stopMd5TV!!.text = "SMd5:" + routesResult.txtFileMd5 -// trajMd5DPQPTV!!.text = -// "TMd5DPQP:" + routesResult.csvFileMd5DPQP -// stopMd5DPQPTV!!.text = -// "SMd5DPQP:" + routesResult.txtFileMd5DPQP -// busTestBar!!.visibility = View.VISIBLE -// } -// } - -// open fun updateBusTestBarInfo() { -// if (busTestBar != null && busTestBar!!.visibility == View.VISIBLE) { -// val routesResult: BusRoutesResult = BusOrderModel.getInstance().busRoutesResult -// lineIdTV!!.text = "lineId:" + (routesResult?.lineId?.toString() ?: "") -// trajMd5TV!!.text = "TMd5:" + if (routesResult == null) "" else routesResult.csvFileMd5 -// stopMd5TV!!.text = "SMd5:" + if (routesResult == null) "" else routesResult.txtFileMd5 -// trajMd5DPQPTV!!.text = -// "TMd5DPQP:" + if (routesResult == null) "" else routesResult.csvFileMd5DPQP -// stopMd5DPQPTV!!.text = -// "SMd5DPQP:" + if (routesResult == null) "" else routesResult.txtFileMd5DPQP -// } -// } /** * END */ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_base_icon_not_in_autopilot.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_base_icon_not_in_autopilot.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_base_icon_not_in_autopilot.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_base_icon_not_in_autopilot.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_base_slide_block.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_base_slide_block.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_base_slide_block.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_base_slide_block.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_brake_stop.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_brake_stop.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_brake_stop.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_brake_stop.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_brake_stop_un.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_brake_stop_un.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_brake_stop_un.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_brake_stop_un.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_close_door_normal.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_close_door_normal.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_close_door_normal.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_close_door_normal.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_close_door_selected.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_close_door_selected.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_close_door_selected.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_close_door_selected.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_disable_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_disable_autopilot_icon.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_disable_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_disable_autopilot_icon.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_ic_autopilot.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_ic_autopilot.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_ic_autopilot.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_ic_autopilot.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_line_panel_bg.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_line_panel_bg.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_line_panel_bg.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_line_panel_bg.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_loading_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_loading_autopilot_icon.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_loading_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_loading_autopilot_icon.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_moderate.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_moderate.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_moderate.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_moderate.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_moderate_un.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_moderate_un.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_moderate_un.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_moderate_un.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_no_bus_line.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_no_bus_line.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_no_bus_line.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_no_bus_line.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_no_line_icon.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_no_line_icon.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_no_line_icon.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_no_line_icon.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_och_dot_line.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_och_dot_line.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_och_dot_line.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_och_dot_line.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_open_door_normal.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_open_door_normal.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_open_door_normal.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_open_door_normal.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_open_door_selected.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_open_door_selected.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_open_door_selected.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_open_door_selected.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_operation_status_bg.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_operation_status_bg.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_operation_status_bg.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_operation_status_bg.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_operation_status_select_bg.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_operation_status_select_bg.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_operation_status_select_bg.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_operation_status_select_bg.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_point_blue_bus.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_point_blue_bus.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_point_blue_bus.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_point_blue_bus.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_point_green_bus.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_point_green_bus.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_point_green_bus.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_point_green_bus.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_reset.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_reset.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_reset.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_reset.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_reset_un.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_reset_un.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_reset_un.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_reset_un.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_right_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_right_autopilot_icon.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_right_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_right_autopilot_icon.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_selected_btn.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_selected_btn.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_selected_btn.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_selected_btn.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_station_start_end.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_station_start_end.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_station_start_end.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_station_start_end.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_unselect_btn.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_unselect_btn.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_unselect_btn.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_unselect_btn.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_whistle.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_whistle.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_whistle.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_whistle.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_whistle_un.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_whistle_un.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_whistle_un.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_whistle_un.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_wrong_autopilot_icon.png b/OCH/charter/driver/src/main/res/drawable-nodpi/charter_wrong_autopilot_icon.png similarity index 100% rename from OCH/charter/driver/src/main/res/drawable-xhdpi/charter_wrong_autopilot_icon.png rename to OCH/charter/driver/src/main/res/drawable-nodpi/charter_wrong_autopilot_icon.png diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_ai_collect.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_ai_collect.png deleted file mode 100755 index 6da7b81fe4..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_ai_collect.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_bad_case.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_bad_case.png deleted file mode 100755 index 22f88301f9..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_bad_case.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_bad_case_normal.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_bad_case_normal.png deleted file mode 100755 index c0a978fc2b..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_bad_case_normal.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_base_icon_in_autopilot.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_base_icon_in_autopilot.png deleted file mode 100644 index 75c26c3d71..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_base_icon_in_autopilot.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_pingxingjiashi.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_pingxingjiashi.png deleted file mode 100644 index 78bfa2687f..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_pingxingjiashi.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_press_start_status.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_press_start_status.png deleted file mode 100755 index af32c20cb5..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_press_start_status.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_setting_btn_bg.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_setting_btn_bg.png deleted file mode 100644 index ba41bf3a53..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_setting_btn_bg.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_start_failure.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_start_failure.png deleted file mode 100755 index 5737f93ad8..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_start_failure.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_start_success.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_start_success.png deleted file mode 100755 index 84246fd323..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_start_success.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_switch_map_long.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_switch_map_long.png deleted file mode 100755 index cf3e5a3778..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_switch_map_long.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_switch_map_medium.png b/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_switch_map_medium.png deleted file mode 100755 index bdc2725468..0000000000 Binary files a/OCH/charter/driver/src/main/res/drawable-xhdpi/charter_switch_map_medium.png and /dev/null differ diff --git a/OCH/charter/driver/src/main/res/drawable/charter_base_autopilot_status_icon_selector.xml b/OCH/charter/driver/src/main/res/drawable/charter_base_autopilot_status_icon_selector.xml deleted file mode 100644 index 6bfd144f39..0000000000 --- a/OCH/charter/driver/src/main/res/drawable/charter_base_autopilot_status_icon_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml index 438d21db04..4407d2dd48 100644 --- a/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml +++ b/OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml @@ -116,8 +116,8 @@ + + + - + app:layout_constraintLeft_toRightOf="@id/toolsView" + android:layout_marginStart="-10dp" + android:layout_marginBottom="@dimen/dp_17" + android:layout_width="@dimen/dp_142" + android:layout_height="@dimen/dp_142"/> - - - - - - - - - - - - - - - - - - - + app:layout_constraintLeft_toRightOf="@id/switch_visual_view" + android:layout_width="@dimen/dp_142" + android:layout_height="@dimen/dp_142"/>