diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java index aa109b728f..e01220ee25 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java @@ -1,6 +1,7 @@ package com.mogo.och.sweeper; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_SWEEPER; import android.content.Context; @@ -39,8 +40,8 @@ public class SweeperProvider implements IMogoOCH { * 进入鹰眼模式,设置手势缩放地图失效 */ private void stepIntoVrMode(){ - CallerLogger.INSTANCE.d( M_BUS + TAG, "进入vr模式" ); - Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()) + CallerLogger.INSTANCE.d( M_SWEEPER + TAG, "进入vr模式" ); + MogoMapUIController.getInstance() .stepInVrMode(false); } @@ -71,7 +72,7 @@ public class SweeperProvider implements IMogoOCH { private final IMogoStatusChangedListener statusChangedListener = (descriptor, isTrue) -> { if (descriptor == StatusDescriptor.VR_MODE) { - // 进入vr模式默认显示网约车小巴fragment + // 进入vr模式默认显示清扫车fragment if (isTrue) { showFragment(); } else { diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java index fe71c27688..fee372a7ab 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java @@ -12,7 +12,6 @@ import android.widget.RelativeLayout; import androidx.constraintlayout.widget.Group; -import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.mvp.IView; import com.mogo.commons.mvp.MvpFragment; @@ -25,6 +24,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener; +import com.mogo.map.MogoMapUIController; import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.listener.MogoMapListenerHandler; import com.mogo.map.marker.IMogoMarkerManager; @@ -35,6 +35,10 @@ import com.mogo.och.sweeper.ui.SweeperOperatePanelView; import com.mogo.och.sweeper.view.SweeperTrafficDataView; import com.mogo.och.sweeper.view.SweeperWorkModeView; +import androidx.constraintlayout.widget.Group; + +import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS; + /** * 网约车基础Fragment,主要负责布局通用界面,处理站点面板和通话面板互斥情况 *

@@ -75,14 +79,12 @@ public abstract class BaseSweeperTabFragment + + + + + + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/bg_task_menu.xml b/OCH/mogo-och-sweeper/src/main/res/drawable/bg_task_menu.xml new file mode 100644 index 0000000000..9942026a18 --- /dev/null +++ b/OCH/mogo-och-sweeper/src/main/res/drawable/bg_task_menu.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/OCH/mogo-och-sweeper/src/main/res/drawable/img_sweeper_status_bg.9.png b/OCH/mogo-och-sweeper/src/main/res/drawable/img_sweeper_status_bg.9.png deleted file mode 100644 index 0af2b9db73..0000000000 Binary files a/OCH/mogo-och-sweeper/src/main/res/drawable/img_sweeper_status_bg.9.png and /dev/null differ diff --git a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml index ac531f1404..b6544ba351 100644 --- a/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml +++ b/OCH/mogo-och-sweeper/src/main/res/layout/sweeper_base_fragment.xml @@ -20,7 +20,7 @@ android:background="@drawable/bg_shape_work_mode" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/sweeper_arc" - android:visibility="gone"/> + android:visibility="visible"/> + + + + + + + + + + + + \ No newline at end of file