+ package="com.mogo.och.noop">
- /
\ No newline at end of file
diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/MogoOCHNoop.java b/OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/MogoOCHNoop.java
deleted file mode 100644
index b55de4fa57..0000000000
--- a/OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/MogoOCHNoop.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.mogo.och.bus;
-
-
-import android.content.Context;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.commons.module.status.IMogoStatusChangedListener;
-import com.mogo.commons.module.status.StatusDescriptor;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-
-/**
- * @author congtaowang
- * @since 2021/1/15
- *
- * 描述
- */
-@Route(path = OCHConstants.PATH)
-public class MogoOCHNoop implements IMogoOCH , IMogoStatusChangedListener {
-
- @Override
- public void createCoverage(FragmentActivity activity, int containerId) {
-
- }
-
- @Nullable
- @Override
- public Fragment createCoverage(@Nullable FragmentActivity activity, @Nullable Integer containerId) {
- return null;
- }
-
- @NotNull
- @Override
- public String getFunctionName() {
- return null;
- }
-
- @Override
- public void onDestroy() {
-
- }
-
- @Override
- public void init(Context context) {
-
- }
-
- @Override
- public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
-
- }
-}
diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/IMogoOCH.java b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/IMogoOCH.java
similarity index 77%
rename from OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/IMogoOCH.java
rename to OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/IMogoOCH.java
index 073f7fcc29..2dc04ff268 100644
--- a/OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/IMogoOCH.java
+++ b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/IMogoOCH.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus;
+package com.mogo.och.noop;
import androidx.annotation.IdRes;
import androidx.fragment.app.FragmentActivity;
@@ -20,5 +20,7 @@ interface IMogoOCH extends IMoGoFunctionProvider {
* @param activity
* @param containerId 容器ID
*/
- void createCoverage(FragmentActivity activity, @IdRes int containerId);
+ default void createCoverage(FragmentActivity activity, @IdRes int containerId){
+
+ };
}
diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/MoGoOCHNoopProvider.kt b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/MoGoOCHNoopProvider.kt
new file mode 100644
index 0000000000..1abf670a2e
--- /dev/null
+++ b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/MoGoOCHNoopProvider.kt
@@ -0,0 +1,92 @@
+package com.mogo.och.noop
+
+import android.content.Context
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.commons.module.status.IMogoStatusChangedListener
+import com.mogo.commons.module.status.MogoStatusManager
+import com.mogo.commons.module.status.StatusDescriptor
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d
+
+/**
+ * @author congtaowang
+ * @since 2021/1/15
+ *
+ *
+ * 描述
+ */
+@Route(path = OCHConstants.PATH)
+class MoGoOCHNoopProvider : IMogoOCH {
+
+ companion object {
+ private const val TAG = "MogoOCHNoopProvider"
+ }
+
+ override val functionName: String
+ get() = TAG
+
+ private var fragment: OchNoopFragment? = null
+ private var containerId = 0
+ private var activity: FragmentActivity? = null
+
+ override fun init(context: Context) {
+ MogoStatusManager.getInstance().registerStatusChangedListener(
+ TAG, StatusDescriptor.VR_MODE, statusChangedListener
+ )
+ }
+
+ private val statusChangedListener =
+ IMogoStatusChangedListener { descriptor: StatusDescriptor, isTrue: Boolean ->
+ if (descriptor == StatusDescriptor.VR_MODE) {
+ // 进入vr模式默认显示网约车小巴fragment
+ if (isTrue) {
+ showFragment()
+ } else {
+ hideFragment()
+ }
+ }
+ }
+
+ private fun showFragment() {
+ activity?.let {
+ if (fragment == null) {
+ d(TAG, "准备add fragment======")
+ val fragmentByTag = it.supportFragmentManager.findFragmentByTag(TAG)
+ fragment = if (fragmentByTag is OchNoopFragment) {
+ fragmentByTag
+ } else {
+ OchNoopFragment()
+ }
+ if (!fragment!!.isAdded) {
+ it.supportFragmentManager.beginTransaction()
+ .add(containerId, fragment!!, TAG).commitAllowingStateLoss()
+ }
+ return
+ }
+ d(TAG, "准备show fragment")
+ fragment?.let { noopFragment ->
+ it.supportFragmentManager.beginTransaction().show(noopFragment)
+ .commitAllowingStateLoss()
+ }
+ }
+ }
+
+ private fun hideFragment() {
+ if (fragment != null) {
+ d(TAG, "准备hide fragment")
+ activity?.supportFragmentManager?.beginTransaction()?.hide(fragment!!)
+ ?.commitAllowingStateLoss()
+ }
+ }
+
+ override fun createCoverage(activity: FragmentActivity?, containerId: Int?): Fragment? {
+ this.containerId = containerId!!
+ this.activity = activity
+ return null
+ }
+
+ override fun onDestroy() {
+
+ }
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/OCHConstants.java b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OCHConstants.java
similarity index 66%
rename from OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/OCHConstants.java
rename to OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OCHConstants.java
index e403d542bc..b0893ba9f8 100644
--- a/OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/OCHConstants.java
+++ b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OCHConstants.java
@@ -1,4 +1,4 @@
-package com.mogo.och.bus;
+package com.mogo.och.noop;
public
/**
@@ -12,5 +12,5 @@ class OCHConstants {
/**
* arouter 路由地址
*/
- public static final String PATH = "/driver/api";
+ public static final String PATH = "/och/noop/api";
}
diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopContract.kt b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopContract.kt
new file mode 100644
index 0000000000..855b980820
--- /dev/null
+++ b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopContract.kt
@@ -0,0 +1,15 @@
+package com.mogo.och.noop
+
+import com.mogo.commons.mvp.IView
+
+
+/**
+ *@author xiaoyuzhou
+ *@date 2021/8/4 3:38 下午
+ */
+interface OchNoopContract {
+
+ interface View : IView {
+
+ }
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopFragment.kt b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopFragment.kt
new file mode 100644
index 0000000000..3dcf55be4f
--- /dev/null
+++ b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopFragment.kt
@@ -0,0 +1,78 @@
+package com.mogo.och.noop
+
+import android.view.View
+import com.mogo.commons.mvp.MvpFragment
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
+import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager
+import com.mogo.eagle.core.function.hmi.ui.setting.ToggleDebugView
+import com.mogo.eagle.core.function.hmi.ui.widget.DemoModeView
+import com.mogo.eagle.core.function.hmi.ui.widget.StatusBarView
+import com.mogo.och.bus.R
+import kotlinx.android.synthetic.main.fragment_hmi.*
+
+class OchNoopFragment : MvpFragment(),
+ OchNoopContract.View {
+
+ companion object {
+ private const val TAG = "OchNoopFragment"
+ }
+
+ override fun getLayoutId(): Int {
+ return R.layout.och_noop_fragment_hmi
+ }
+
+ override fun getTagName(): String {
+ return TAG
+ }
+
+ override fun createPresenter(): OchNoopPresenter {
+ return OchNoopPresenter(this)
+ }
+
+ override fun initViews() {
+
+ //设置StatusBar初始状态
+ CallerHmiViewControlListenerManager.updateStatusBarRightView(
+ StatusBarView.TAG,
+ FunctionBuildConfig.isDemoMode,
+ "demoMode",
+ DemoModeView(requireContext())
+ )
+
+ viewShowDebugView.setOnLongClickListener {
+ ToggleDebugView.toggleDebugView.toggle(requireContext())
+ true
+ }
+
+ cbMsgBoxDriver.setOnCheckedChangeListener { _, isChecked ->
+ if (isChecked) {
+ viewDriverMsgBoxList.visibility = View.VISIBLE
+ viewDriverMsgBoxList.notifyData()
+ viewDriverMsgBoxBubble.visibility = View.GONE
+ viewDriverMsgBoxBubble.isShowData(false)
+ CallerHmiManager.updateDriverMsgBoxTipView(false)
+ } else {
+ viewDriverMsgBoxList.visibility = View.GONE
+ viewDriverMsgBoxBubble.visibility = View.VISIBLE
+ viewDriverMsgBoxBubble.isShowData(true)
+ }
+ }
+
+ cbMsgBoxPassenger.setOnCheckedChangeListener { _, isChecked ->
+ if (isChecked) {
+ viewPassengerMsgBoxList.visibility = View.VISIBLE
+ viewPassengerMsgBoxBubble.visibility = View.GONE
+ viewPassengerMsgBoxBubble.isShowData(false)
+ CallerHmiManager.updatePassengerMsgBoxTipView(false)
+ } else {
+ viewPassengerMsgBoxList.visibility = View.GONE
+ viewPassengerMsgBoxBubble.visibility = View.VISIBLE
+ viewPassengerMsgBoxBubble.isShowData(true)
+ }
+ }
+
+ }
+
+
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopPresenter.kt b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopPresenter.kt
new file mode 100644
index 0000000000..0d690328cf
--- /dev/null
+++ b/OCH/mogo-och-noop/src/main/java/com/mogo/och/noop/OchNoopPresenter.kt
@@ -0,0 +1,8 @@
+package com.mogo.och.noop
+
+import com.mogo.commons.mvp.Presenter
+
+class OchNoopPresenter(view: OchNoopContract.View?) :
+ Presenter(view) {
+
+}
\ No newline at end of file
diff --git a/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml b/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml
new file mode 100644
index 0000000000..2638954937
--- /dev/null
+++ b/OCH/mogo-och-noop/src/main/res/layout/och_noop_fragment_hmi.xml
@@ -0,0 +1,318 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 cbdaa3867e..daace6a4e0 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
@@ -10,12 +10,15 @@ 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.HmiBuildConfig;
+import com.mogo.eagle.core.data.constants.DataTypes;
+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.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.call.map.CallerMapUIServiceManager;
import com.mogo.eagle.core.function.call.map.CallerSmpManager;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener;
import com.mogo.map.listener.IMogoMapListener;
import com.mogo.map.listener.MogoMapListenerHandler;
@@ -28,6 +31,12 @@ import com.mogo.och.sweeper.ui.popwindow.MenuPopWindow;
import com.mogo.och.sweeper.view.SweeperCurrentTaskInfoView;
import com.mogo.och.sweeper.view.SweeperTrafficDataView;
import com.mogo.och.sweeper.view.SweeperWorkModeView;
+import com.mogo.och.sweeper.bean.SweeperRoutesResult;
+import com.mogo.och.sweeper.constant.SweeperConst;
+import com.mogo.och.sweeper.model.SweeperOrderModel;
+import com.mogo.och.sweeper.util.BDRouteDataTestUtils;
+import com.mogo.och.sweeper.view.SlidePanelView;
+import com.mogo.och.sweeper.view.SweeperTrafficDataView;
import androidx.constraintlayout.widget.Group;
import androidx.fragment.app.FragmentTransaction;
@@ -133,9 +142,7 @@ public abstract class BaseSweeperTabFragment
- implements IMogoMapListener, TaxiPassengerTaxiView, ITPClickStartAutopilotCallback, IMoGoHmiViewProxy.IViewNotificationProvider {
+ implements IMogoMapListener, TaxiPassengerTaxiView, ITPClickStartAutopilotCallback{
static final String TAG = "TaxiPassengerBaseFragment";
@@ -91,8 +91,6 @@ public class TaxiPassengerBaseFragment extends MvpFragment
+
+
+
stepIntoVrMode(), 5_000L);
return null;
}
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
index e3f6196201..9911796fdc 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
@@ -34,7 +34,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager;
import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager;
-import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
import com.mogo.eagle.core.utilcode.util.NetworkUtils;
@@ -263,7 +262,7 @@ public class TaxiModel {
MogoStatusManager.getInstance().unregisterStatusChangedListener(TAG, StatusDescriptor.VR_MODE, mMogoStatusChangedListener);
// 注销地图监听
- CallerMapLocationListenerManager.INSTANCE.removeListener(TAG,false);
+ CallerChassisLocationGCJ20ListenerManager.INSTANCE.removeListener(TAG);
OCHSocketMessageManager.INSTANCE.releaseSocketMessageListener(OCHSocketMessageManager.msgMonitorType);
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 060821b7e9..00728669d3 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
@@ -24,7 +24,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.HmiBuildConfig;
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;
@@ -202,9 +201,7 @@ public abstract class BaseTaxiTabFragment
+
+
+