diff --git a/OCH/mogo-och-bus-passenger/src/main/res/drawable/iv_roma_bus_passenger_bg.png b/OCH/mogo-och-bus-passenger/src/main/res/drawable/iv_roma_bus_passenger_bg.png new file mode 100644 index 0000000000..405d2cddaa Binary files /dev/null and b/OCH/mogo-och-bus-passenger/src/main/res/drawable/iv_roma_bus_passenger_bg.png differ diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml index 608ac59429..2d3747ce41 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_base_fragment.xml @@ -56,6 +56,15 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> + + - - \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml index 8567a7a783..64bce3038e 100644 --- a/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml +++ b/OCH/mogo-och-bus-passenger/src/main/res/layout/bus_p_route_fragment.xml @@ -58,7 +58,7 @@ app:layout_constraintBottom_toBottomOf="@+id/bus_p_speed_tv" app:layout_constraintLeft_toRightOf="@+id/bus_p_speed_tv" /> - + + + \ No newline at end of file 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 25e7216333..2b596c4b6e 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 @@ -1,6 +1,5 @@ package com.mogo.och.bus.fragment; -import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; import static com.mogo.och.bus.constant.BusConst.TIMER_START_AUTOPILOT_INTERVAL; import android.animation.ObjectAnimator; @@ -22,7 +21,6 @@ import androidx.constraintlayout.widget.Group; import com.mogo.commons.mvp.IView; import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.mvp.Presenter; -import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; @@ -30,17 +28,14 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListener import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; -import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager; 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.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.map.MogoMapUIController; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.listener.MogoMapListenerHandler; import com.mogo.map.uicontroller.IMogoMapUIController; @@ -78,7 +73,6 @@ public abstract class BaseBusTabFragment protected TextView tvArrived; protected RelativeLayout mSettingBtn; protected RelativeLayout mBadcaseBtn; - protected RelativeLayout mAICollectBtn; private FrameLayout flStationPanelContainer; private MapBizView mapBizView; private Group groupTestPanel; @@ -147,18 +141,12 @@ public abstract class BaseBusTabFragment if (controller != null) { //切换地图的远近视图 if (controller.getCurrentMapVisualAngle().isLongSight()) { - CallerVisualAngleManager.INSTANCE.updateLongSightLevel(false); Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true); controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null); mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium); } else if (controller.getCurrentMapVisualAngle().isMediumSight()) { - CallerVisualAngleManager.INSTANCE.updateLongSightLevel(true); - if (FunctionBuildConfig.isRomaMode) { - controller.setRomaMode(1); - } else { - Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false); - controller.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null); - } + Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false); + controller.changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null); mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_long); } else { controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null); @@ -218,21 +206,17 @@ 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); - } //消息盒子 viewDriverMsgBoxButton = findViewById(R.id.viewDriverMsgBoxButton); viewDriverMsgBoxList = findViewById(R.id.viewDriverMsgBoxList); viewDriverMsgBoxBubble = findViewById(R.id.viewDriverMsgBoxBubble); viewDriverMsgBoxButton.setClickListener(show -> { - if(show){ + if (show) { viewDriverMsgBoxList.setVisibility(View.VISIBLE); viewDriverMsgBoxList.notifyData(); viewDriverMsgBoxBubble.setVisibility(View.GONE); viewDriverMsgBoxBubble.isShowData(false); - }else{ + } else { viewDriverMsgBoxList.setVisibility(View.GONE); viewDriverMsgBoxBubble.setVisibility(View.VISIBLE); viewDriverMsgBoxBubble.isShowData(true); 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 63d4c81b3e..5ff5a55ce8 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 @@ -9,7 +9,7 @@ + android:layout_height="match_parent" /> + android:layout_height="match_parent" /> - - - - + app:layout_constraintLeft_toRightOf="@id/module_mogo_och_badcase_rl"/> + app:layout_constraintEnd_toEndOf="parent" /> \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java index 2a95fd785d..c7ce8bb793 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java @@ -14,11 +14,9 @@ import androidx.fragment.app.FragmentTransaction; import com.mogo.commons.module.status.MogoStatusManager; import com.mogo.commons.mvp.MvpFragment; -import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; -import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager; import com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxBubbleView; import com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxButtonView; import com.mogo.eagle.core.function.hmi.ui.msgbox.PassengerMsgBoxListView; @@ -52,7 +50,7 @@ import java.util.Objects; * @author tongchenfei */ public class TaxiPassengerBaseFragment extends MvpFragment - implements IMogoMapListener, TaxiPassengerTaxiView, ITPClickStartAutopilotCallback{ + implements IMogoMapListener, TaxiPassengerTaxiView, ITPClickStartAutopilotCallback { static final String TAG = "TaxiPassengerBaseFragment"; @@ -109,11 +107,11 @@ public class TaxiPassengerBaseFragment extends MvpFragment { - if(show){ + if (show) { viewPassengerMsgBoxList.setVisibility(View.VISIBLE); viewPassengerMsgBoxBubble.setVisibility(View.GONE); viewPassengerMsgBoxBubble.isShowData(false); - }else{ + } else { viewPassengerMsgBoxList.setVisibility(View.GONE); viewPassengerMsgBoxBubble.setVisibility(View.VISIBLE); viewPassengerMsgBoxBubble.isShowData(true); @@ -146,18 +144,12 @@ public class TaxiPassengerBaseFragment extends MvpFragment { - OverlayLeftViewUtils.INSTANCE.showOverlayView(getActivity(),0,true,-1,true); + OverlayLeftViewUtils.INSTANCE.showOverlayView(getActivity(), 0, true, -1, true); //showOrHideArrivedEndLayout(true, "北京北京北京", "1527481606997577728"); //showOrHidePressengerCheckPager(true, "开始站点开", "开始站点开始站点开始", "2", "京A888888", "18811539480"); //OCHFloatWindowManager.getInstance().ShowFloatWindow(getContext()); diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_roma_passenger_bg.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_roma_passenger_bg.png new file mode 100644 index 0000000000..41378d1b41 Binary files /dev/null and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/iv_roma_passenger_bg.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml index 4c54205202..2fb2529505 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -54,6 +54,15 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> + + - + + + \ 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 8b408dc38d..2bd1fc7c0d 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 @@ -25,7 +25,6 @@ import androidx.fragment.app.FragmentTransaction; import com.mogo.commons.mvp.IView; import com.mogo.commons.mvp.MvpFragment; import com.mogo.commons.mvp.Presenter; -import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; @@ -33,7 +32,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListener import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; -import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager; 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; @@ -43,7 +41,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; 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.MogoMapUIController; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.VisualAngleMode; @@ -84,7 +81,6 @@ public abstract class BaseTaxiTabFragment { - if(show){ + if (show) { viewDriverMsgBoxList.setVisibility(View.VISIBLE); viewDriverMsgBoxList.notifyData(); viewDriverMsgBoxBubble.setVisibility(View.GONE); viewDriverMsgBoxBubble.isShowData(false); - }else{ + } else { viewDriverMsgBoxList.setVisibility(View.GONE); viewDriverMsgBoxBubble.setVisibility(View.VISIBLE); viewDriverMsgBoxBubble.isShowData(true); 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 bdc8f211c2..c8e273ad91 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 @@ -9,7 +9,7 @@ + android:layout_height="match_parent" /> + android:textColor="#FFFFFF" + android:textSize="74dp" /> + android:textSize="32dp" /> @@ -58,8 +56,8 @@ android:id="@+id/module_mogo_och_autopilot_status" android:layout_width="@dimen/taxi_tab_autoaploit_width" android:layout_height="@dimen/taxi_tab_autoaploit_height" - android:layout_marginTop="20dp" android:layout_marginLeft="220dp" + android:layout_marginTop="20dp" android:background="@drawable/taxi_autopilot_bg_selector" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -71,24 +69,24 @@ + android:layout_gravity="center_horizontal" + android:layout_marginTop="@dimen/dp_56" + android:src="@drawable/taxi_ic_autopilot" /> + @@ -96,7 +94,7 @@ + android:layout_height="match_parent" /> + app:layout_constraintTop_toTopOf="parent" /> + tools:visibility="visible" /> + app:layout_constraintTop_toBottomOf="@+id/ivCameraIcon" /> @@ -254,16 +251,17 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" /> + + android:textColor="@color/taxi_role_text_color" + android:textSize="@dimen/taxi_diver_role_size" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" /> + + android:background="@drawable/bad_case_selector" /> - - - + app:layout_constraintLeft_toRightOf="@id/module_och_taxi_badcase_ll"/>