From 8221f41ff97a59c0dcfed2f1a762aa5893c0df02 Mon Sep 17 00:00:00 2001 From: EmArrow Date: Mon, 30 Sep 2024 12:54:41 +0800 Subject: [PATCH] [6.7.0] remove unuse code --- .../src/main/res/layout/bus_base_fragment.xml | 19 - .../res/jinlv/layout/bus_p_base_fragment.xml | 1 - .../och/taxi/presenter/TaxiPresenter.java | 3 +- .../mogo/och/taxi/ui/BaseTaxiTabFragment.java | 46 +- .../taxi/ui/base/BaseTaxiTabFragment.kt | 331 +++--------- .../och/unmanned/taxi/ui/base/TaxiFragment.kt | 40 +- .../layout/unmanned_taxi_base_fragment.xml | 368 +------------ .../function/hmi/ui/logcatch/AbsLogView.kt | 495 ------------------ .../hmi/ui/logcatch/AbsRecyclerAdapter.java | 148 ------ .../hmi/ui/logcatch/AbsViewBinder.java | 55 -- .../core/function/hmi/ui/logcatch/ILogView.kt | 82 --- .../hmi/ui/logcatch/ILogViewListener.kt | 6 - .../hmi/ui/logcatch/LastLogViewPosInfo.kt | 30 -- .../hmi/ui/logcatch/LogFrameLayout.kt | 26 - .../function/hmi/ui/logcatch/LogInfoView.kt | 286 ---------- .../hmi/ui/logcatch/LogItemAdapter.java | 255 --------- .../function/hmi/ui/logcatch/LogLine.java | 203 ------- .../function/hmi/ui/logcatch/LogTitleBar.java | 114 ---- .../hmi/ui/logcatch/LogViewLayoutParams.java | 49 -- .../function/hmi/ui/logcatch/TouchProxy.java | 32 -- .../hmi/ui/setting/DebugSettingView.kt | 246 ++------- .../function/hmi/ui/utils/SearchCriteria.kt | 120 ----- .../hmi/ui/widget/LimitingVelocityView.kt | 69 --- .../function/hmi/ui/widget/RomaBusView.kt | 123 ----- .../function/hmi/ui/widget/RomaTaxiView.kt | 125 ----- .../hmi/ui/widget/SpeedChartView.java | 184 ------- .../function/hmi/ui/widget/SpeedPanelView.kt | 63 --- .../hmi/ui/widget/SteeringWheelView.kt | 189 ------- .../src/main/res/drawable-xhdpi/bg_auto.png | Bin 60850 -> 0 bytes .../main/res/drawable-xhdpi/bg_auto_bus.png | Bin 321394 -> 0 bytes .../main/res/drawable-xhdpi/bg_auto_nor.png | Bin 62821 -> 0 bytes .../res/drawable-xhdpi/icon_in_steering.png | Bin 3310 -> 0 bytes .../main/res/drawable-xhdpi/steering_bg.png | Bin 133203 -> 0 bytes .../res/drawable-xhdpi/steering_bg_bus.png | Bin 111377 -> 0 bytes .../res/drawable/bg_steering_outer_bus.xml | 13 - .../res/drawable/bg_steering_outer_taxi.xml | 13 - .../res/drawable/bg_steering_wheel_bus.xml | 9 - .../res/drawable/bg_steering_wheel_taxi.xml | 9 - .../res/drawable/layer_roma_distance_bg.xml | 7 - .../res/drawable/radio_button_background.xml | 5 - .../drawable/radio_button_background_left.xml | 5 - .../radio_button_background_middle.xml | 5 - .../radio_button_background_right.xml | 5 - .../radio_button_checked_background.xml | 13 - .../radio_button_checked_background_left.xml | 15 - ...radio_button_checked_background_middle.xml | 14 - .../radio_button_checked_background_right.xml | 15 - .../radio_button_normal_background.xml | 13 - .../radio_button_normal_background_left.xml | 15 - .../radio_button_normal_background_middle.xml | 14 - .../main/res/drawable/roma_bg_selector.xml | 8 - .../res/drawable/roma_normal_select_bg.png | Bin 5547 -> 0 bytes .../res/drawable/roma_press_select_bg.png | Bin 6272 -> 0 bytes .../res/drawable/romabg_normal_select.xml | 13 - .../res/drawable/romabg_press_select_bg.xml | 13 - .../main/res/drawable/romafront_select_bg.xml | 8 - .../res/layout/hmi_steering_wheel_bus.xml | 97 ---- .../res/layout/hmi_steering_wheel_taxi.xml | 97 ---- .../src/main/res/layout/item_log.xml | 74 --- .../src/main/res/layout/log_title_bar.xml | 26 - .../src/main/res/layout/log_view.xml | 165 ------ .../main/res/layout/view_debug_setting.xml | 23 - .../res/layout/view_limiting_speed_vr.xml | 33 -- .../src/main/res/layout/view_roma_bus_bg.xml | 23 - .../src/main/res/layout/view_roma_taxi_bg.xml | 39 -- .../src/main/res/values/color.xml | 1 - .../src/main/res/values/styles.xml | 40 -- .../obu/CallerObuConnectListenerManager.kt | 3 + .../drawable/bg_waring_limiting_velocity.xml | 23 - .../drawable/yi_biao_pan_bg_nor.xml | 12 - .../drawable/yi_biao_pan_bg_speeding.xml | 14 - 71 files changed, 147 insertions(+), 4443 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/AbsLogView.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/AbsRecyclerAdapter.java delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/AbsViewBinder.java delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/ILogView.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/ILogViewListener.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LastLogViewPosInfo.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LogFrameLayout.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LogInfoView.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LogItemAdapter.java delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LogLine.java delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LogTitleBar.java delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/LogViewLayoutParams.java delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/logcatch/TouchProxy.java delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/utils/SearchCriteria.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/LimitingVelocityView.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaBusView.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaTaxiView.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedChartView.java delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SteeringWheelView.kt delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_auto.png delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_auto_bus.png delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/bg_auto_nor.png delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_in_steering.png delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/steering_bg.png delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/steering_bg_bus.png delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_outer_bus.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_outer_taxi.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_wheel_bus.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_steering_wheel_taxi.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/layer_roma_distance_bg.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_background.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_background_left.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_background_middle.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_background_right.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_left.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_middle.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_checked_background_right.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background_left.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/radio_button_normal_background_middle.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/roma_bg_selector.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/roma_normal_select_bg.png delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/roma_press_select_bg.png delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/romabg_normal_select.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/romabg_press_select_bg.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/romafront_select_bg.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_bus.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/hmi_steering_wheel_taxi.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_log.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_title_bar.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/log_view.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_limiting_speed_vr.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_bus_bg.xml delete mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_roma_taxi_bg.xml delete mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable/bg_waring_limiting_velocity.xml delete mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable/yi_biao_pan_bg_nor.xml delete mode 100644 core/mogo-core-res/src/main/function-hmi-res/drawable/yi_biao_pan_bg_speeding.xml 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 0bd98cd161..bd33539f86 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 @@ -233,17 +233,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/toolsView" /> - - - - diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java index ec2067785f..3d93ae699a 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java @@ -332,7 +332,7 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS @Override public void run() { if(mView!=null) { - /** 2023.12.18 1.去除"自驾/安全"模式选择，默认自驾模式且无需点击； + /* 2023.12.18 1.去除"自驾/安全"模式选择，默认自驾模式且无需点击； * 2.server去除订单流转对"安全确认"的限制（读写接口默认反馈ok，但"开启自动驾驶成功"不再限制） */ mView.updateCtvAutopilotStatusTag(false); @@ -511,7 +511,6 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS role = TaxiConst.TEST_USER; } } - String finalRole = role; } @Override diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index 3b628cb458..52a905e080 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -2,22 +2,17 @@ package com.mogo.och.taxi.ui; import static com.mogo.och.taxi.constant.TaxiConst.TIMER_START_AUTOPILOT_INTERVAL; -import android.animation.ObjectAnimator; import android.content.Context; +import android.content.res.Configuration; import android.os.Bundle; import android.os.Handler; import android.os.Looper; -import android.view.LayoutInflater; import android.view.View; -import android.view.animation.LinearInterpolator; import android.widget.FrameLayout; import android.widget.ImageView; -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.FragmentActivity; import androidx.fragment.app.FragmentTransaction; @@ -29,18 +24,13 @@ import com.mogo.eagle.core.function.api.och.toolkit.IToolKitItemClickListener; 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.hmi.CallerHmiViewControlListenerManager; import com.mogo.eagle.core.function.call.och.CallerEagleBaseFunctionCall4OchManager; import com.mogo.eagle.core.function.hmi.map.MapContainerLayout; import com.mogo.eagle.core.function.view.MapRoamView; -import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener; -import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.listener.IMogoMapListener; -import com.mogo.och.common.module.utils.ResourcesUtils; import com.mogo.och.common.module.wigets.map.drawline.LineView; -import com.mogo.och.common.module.wigets.map.orderstatus.OrderStatusView; -import com.mogo.och.common.module.wigets.map.overmapview.OverMapDialog; -import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager; import com.mogo.och.taxi.R; import java.lang.ref.WeakReference; @@ -56,16 +46,12 @@ public abstract class BaseTaxiTabFragment> : MvpFragment(), IMogoMapListener, IMoGoAutopilotRecordListener{ +abstract class BaseTaxiTabFragment> : MvpFragment(), + IMogoMapListener, IMoGoAutopilotRecordListener { companion object { const val TAG = "BaseTaxiTabFragment" } @@ -72,14 +47,10 @@ abstract class BaseTaxiTabFragment> : MvpFragment? = null @@ -88,132 +59,58 @@ abstract class BaseTaxiTabFragment> : MvpFragment(R.id.btnOpenDebugView)?.setOnClickListener { - val intent = Intent() - intent.action = DebugView.BROADCAST_ACTION - intent.putExtra(DebugView.BROADCAST_DATA_SHOW, true) - LocalBroadcastManager.getInstance(requireContext()).sendBroadcast(intent) - } - - // 关闭任务调试面板 - findViewById(R.id.btnCloseDebugView)?.setOnClickListener { - val intent = Intent() - intent.action = DebugView.BROADCAST_ACTION - intent.putExtra(DebugView.BROADCAST_DATA_SHOW, false) - LocalBroadcastManager.getInstance(requireContext()).sendBroadcast(intent) - } - - module_mogo_och_operation_status.setOnClickListener(object : OnPreventFastClickListener() { - override fun onClickImpl(v: View?) { - if (MogoStatusManager.getInstance().isTaxiUnmanedDriverLineRoutingVerifyMode) { - ToastUtils.showLong("退出验证模式后再接单吧") - return - } - onChangeOperationStatus() - } - }) - taxi_close_navi_icon.setOnClickListener { showAmapNaviToStationFragment(false) showRoutingToStationFragment(false) } - smallMapView.onClick { - context?.let { - if(overMapDialog==null){ - overMapDialog = OverMapDialog(it); - } - aciv_show_guid.visibility = View.GONE - overMapDialog?.showDialog() - } - } context?.let { - CallerEagleBaseFunctionCall4OchManager.addSingleToolKitDefaultItem(runningTaskGateWay,"运营面板", R.drawable.common_biz_operation,4); - CallerEagleBaseFunctionCall4OchManager.addToolKitDefaultItemClickListener(runningTaskGateWay,object : - IToolKitItemClickListener { - override fun onItemClick(toolTag: String, ctx: Context?) { - when(toolTag) { - runningTaskGateWay -> { - personalDialogFragment = WeakReference(TaxiOperationalDialogFragment()) - activity?.supportFragmentManager?.let { - personalDialogFragment!!.get() - ?.show(it, "service_data") + CallerEagleBaseFunctionCall4OchManager.addSingleToolKitDefaultItem( + runningTaskGateWay, + "运营面板", + R.drawable.common_biz_operation, + 4 + ); + CallerEagleBaseFunctionCall4OchManager.addToolKitDefaultItemClickListener( + runningTaskGateWay, + object : + IToolKitItemClickListener { + override fun onItemClick(toolTag: String, ctx: Context?) { + when (toolTag) { + runningTaskGateWay -> { + personalDialogFragment = + WeakReference(TaxiOperationalDialogFragment()) + activity?.supportFragmentManager?.let { + personalDialogFragment!!.get() + ?.show(it, "service_data") + } } } } - } - }); - CallerEagleBaseFunctionCall4OchManager.addSingleToolKitCustomItem(lineView, LineView(it),10); + }); + CallerEagleBaseFunctionCall4OchManager.addSingleToolKitCustomItem( + lineView, + LineView(it), + 10 + ); } } @@ -221,48 +118,49 @@ abstract class BaseTaxiTabFragment> : MvpFragment> : MvpFragment> : MvpFragment> : MvpFragment> : MvpFragment> : MvpFragment(), private var routingVerifyFragment: WeakReference? = null - private var moFanglistener: IMogoStatusChangedListener? = object :IMogoStatusChangedListener{ + private var moFanglistener: IMogoStatusChangedListener? = object : IMogoStatusChangedListener { override fun onStatusChanged(descriptor: StatusDescriptor?, isTrue: Boolean) { if (StatusDescriptor.TAXI_UNMANED_DRIVER_LINE_ROUTING_VERIFY_MODE == descriptor) { UiThreadHandler.post { @@ -130,9 +126,7 @@ class TaxiFragment : BaseTaxiTabFragment(), super.initViews() initFlowEvent() initFragment() - hideDebugPanel() switchVRFlatMode(MogoStatusManager.getInstance().isVrMode) - module_mogo_och_operation_status.visibility = View.VISIBLE initOrderDebugView() } @@ -163,8 +157,8 @@ class TaxiFragment : BaseTaxiTabFragment(), showTaskFragment() MogoStatusManager.getInstance() .registerStatusChangedListener( - TAG, StatusDescriptor.TAXI_UNMANED_DRIVER_LINE_ROUTING_VERIFY_MODE - ,moFanglistener) + TAG, StatusDescriptor.TAXI_UNMANED_DRIVER_LINE_ROUTING_VERIFY_MODE, moFanglistener + ) } private fun showTaskFragment() { @@ -219,8 +213,10 @@ class TaxiFragment : BaseTaxiTabFragment(), override fun onDestroyView() { e(SceneConstant.M_TAXI + TAG, "onDestroyView") - MogoStatusManager.getInstance().unregisterStatusChangedListener(TAG, - StatusDescriptor.TAXI_UNMANED_DRIVER_LINE_ROUTING_VERIFY_MODE,moFanglistener) + MogoStatusManager.getInstance().unregisterStatusChangedListener( + TAG, + StatusDescriptor.TAXI_UNMANED_DRIVER_LINE_ROUTING_VERIFY_MODE, moFanglistener + ) if (mPresenter != null) { mPresenter?.onDestroy(this) } @@ -243,13 +239,8 @@ class TaxiFragment : BaseTaxiTabFragment(), e(SceneConstant.M_TAXI + TAG, "onDetach") } - fun setRole(finalRole:String){ - if (!TextUtils.isEmpty(finalRole)) { - taxi_driver_role_tv.visibility = View.VISIBLE - taxi_driver_role_tv.text = finalRole - } else { - taxi_driver_role_tv.visibility = View.GONE - } + fun setRole(finalRole: String) { + } /** @@ -262,13 +253,12 @@ class TaxiFragment : BaseTaxiTabFragment(), SceneConstant.M_TAXI + TAG, "onOperationChanged:$inOperation" ) - if (inOperation==OpenOrderStatusEnum.Ordering) { + if (inOperation == OpenOrderStatusEnum.Ordering) { showDebugPanel() - } else { - taxi_driver_role_tv.visibility = View.GONE } updateOperationBtnStatusOnModeChange(MogoStatusManager.getInstance().isTaxiUnmanedDriverLineRoutingVerifyMode) - MogoStatusManager.getInstance().setTaxiUnmanedDriverTakingOrders(TAG, inOperation==OpenOrderStatusEnum.Ordering) + MogoStatusManager.getInstance() + .setTaxiUnmanedDriverTakingOrders(TAG, inOperation == OpenOrderStatusEnum.Ordering) } private fun updateOperationBtnStatusOnModeChange(isRoutingVerifyMode: Boolean) { @@ -279,8 +269,8 @@ class TaxiFragment : BaseTaxiTabFragment(), override fun onMapLoaded() {} - fun updateAutopilotStatus(status: Int,canStartAuto:Boolean) { - onAutopilotStatusChanged(status,canStartAuto) + fun updateAutopilotStatus(status: Int, canStartAuto: Boolean) { + onAutopilotStatusChanged(status, canStartAuto) } fun onNaviToEnd(isAmap: Boolean, isShow: Boolean) { diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml index 455dfdd732..9bf286701f 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml @@ -3,177 +3,24 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="@dimen/dp_status_bar_height"> - + android:layout_height="match_parent"> - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -