Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_251_220125_2.5.1' into dev_robotaxi-d-app-module_251_220125_2.5.1

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/OchBusProvider.java

@@ -6,13 +6,13 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.och.bus.constant.OchBusConst;
 import com.mogo.och.bus.fragment.OchBusFragment;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
-import com.mogo.utils.UiThreadHandler;
-import com.mogo.utils.logger.Logger;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java

@@ -25,7 +25,9 @@ import com.mogo.commons.mvp.Presenter;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.uicontroller.VisualAngleMode;
 import com.mogo.module.common.MogoApisHandler;
@@ -34,8 +36,6 @@ import com.mogo.module.common.view.OnPreventFastClickListener;
 import com.mogo.och.bus.R;
 import com.mogo.och.bus.view.BusArcView;
 import com.mogo.och.bus.view.SlidePanelView;
-import com.mogo.utils.UiThreadHandler;
-import com.mogo.utils.logger.Logger;
 
 /**
  * 网约车基础Fragment，主要负责布局通用界面，处理站点面板和通话面板互斥情况

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/OchBusFragment.java

@@ -8,13 +8,13 @@ import androidx.annotation.NonNull;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.och.bus.R;
 import com.mogo.och.bus.bean.OchBusStation;
 import com.mogo.och.bus.presenter.OchBusPresenter;
 import com.mogo.och.bus.view.SlidePanelView;
-import com.mogo.utils.logger.Logger;
 
 import java.util.List;
 

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/OCHBusServiceManager.java

@@ -6,6 +6,7 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
 import com.mogo.eagle.core.data.BaseData;
 import com.mogo.eagle.core.network.RequestOptions;
 import com.mogo.eagle.core.network.SubscribeImpl;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.och.bus.BuildConfig;
 import com.mogo.och.bus.bean.CarHeartbeatReqBean;
@@ -19,7 +20,6 @@ import com.mogo.och.bus.bean.OchBusUpdateSiteStatusRequest;
 import com.mogo.och.bus.bean.QueryLeaveAwayPassengersRequest;
 import com.mogo.och.bus.bean.QueryLeaveAwayPassengersResponse;
 import com.mogo.och.bus.presenter.OchBusOrderModel;
-import com.mogo.utils.logger.Logger;
 
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusModelLoopManager.java

@@ -1,7 +1,7 @@
 package com.mogo.och.bus.presenter;
 
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.och.bus.constant.OchBusConst;
-import com.mogo.utils.logger.Logger;
 
 import java.util.concurrent.TimeUnit;
 

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusOrderModel.java

@@ -17,7 +17,10 @@ import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
+import com.mogo.eagle.core.utilcode.util.NetworkUtils;
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.och.bus.bean.OchBusOperationStatusResponse;
@@ -38,9 +41,6 @@ import com.mogo.och.bus.util.PinYinUtil;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
-import com.mogo.utils.NetworkUtils;
-import com.mogo.utils.UiThreadHandler;
-import com.mogo.utils.logger.Logger;
 
 import java.util.ArrayList;
 import java.util.List;

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java

@@ -11,14 +11,14 @@ import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo;
 import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.och.bus.bean.OchBusStation;
 import com.mogo.och.bus.callback.CarOperationStatusCallback;
 import com.mogo.och.bus.callback.IOCHBusControllerStatusCallback;
 import com.mogo.och.bus.callback.RefreshBusStationsCallback;
 import com.mogo.och.bus.callback.SlidePannelHideCallback;
 import com.mogo.och.bus.fragment.OchBusFragment;
-import com.mogo.utils.UiThreadHandler;
-import com.mogo.utils.logger.Logger;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/receiver/TestOchBusBroadcastReceiver.java

@@ -4,8 +4,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
+import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.och.bus.constant.OchBusConst;
-import com.mogo.utils.logger.Logger;
 
 /**
  * 测试小巴车的场景

OCH/mogo-och-noop/build.gradle

@@ -42,15 +42,15 @@ dependencies {
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
         implementation rootProject.ext.dependencies.mogoutils
         implementation rootProject.ext.dependencies.mogocommons
+        implementation rootProject.ext.dependencies.modulecommon
         implementation rootProject.ext.dependencies.mogo_core_data
-
-        implementation rootProject.ext.dependencies.mogo_core_function_api
+        implementation rootProject.ext.dependencies.mogo_core_function_call
     }else {
-        implementation project(':core:mogo-core-function-api')
         implementation project(":core:mogo-core-utils")
-        implementation project(':core:mogo-core-data')
-
         implementation project(":foudations:mogo-commons")
+        implementation project(':modules:mogo-module-common')
+        implementation project(':core:mogo-core-data')
+        implementation project(':core:mogo-core-function-call')
     }
 }
 

OCH/mogo-och-noop/src/main/java/com/mogo/och/bus/MogoOCHNoop.java

@@ -1,15 +1,16 @@
 package com.mogo.och.bus;
 
+
 import android.content.Context;
 
-import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
+import com.mogo.service.statusmanager.IMogoStatusChangedListener;
+import com.mogo.service.statusmanager.StatusDescriptor;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 
@@ -20,19 +21,23 @@ import org.jetbrains.annotations.Nullable;
  * 描述
  */
 @Route(path = OCHConstants.PATH)
-public class MogoOCHNoop implements IMoGoFunctionProvider {
-
-    private static final String TAG = "MogoOCHNoop";
+public class MogoOCHNoop implements IMogoOCH , IMogoStatusChangedListener {
 
     @Override
-    public void init(Context context) {
-        Logger.d(TAG, "noop-");
+    public void createCoverage(FragmentActivity activity, int containerId) {
+
     }
 
-    @NonNull
+    @Nullable
+    @Override
+    public Fragment createCoverage(@Nullable FragmentActivity activity, @Nullable Integer containerId) {
+        return null;
+    }
+
+    @NotNull
     @Override
     public String getFunctionName() {
-        return TAG;
+        return null;
     }
 
     @Override
@@ -40,10 +45,13 @@ public class MogoOCHNoop implements IMoGoFunctionProvider {
 
     }
 
-    @Nullable
     @Override
-    public Fragment createCoverage(@Nullable FragmentActivity fragmentActivity, @Nullable Integer integer) {
-        Logger.d(TAG, "noop-");
-        return null;
+    public void init(Context context) {
+
+    }
+
+    @Override
+    public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
+
     }
 }