[Fix]

修复合并问题

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>

core/README.md

@@ -2,13 +2,16 @@
 本模块用来编写鹰眼核型功能
 
 - function-impl 目录下编写的都是对mogo-core-function-api定的功能实现,
-    - mogo-core-function-check      程序及车辆检测模块
-    - mogo-core-function-hmi        UI呈现及交互模块
-    - mogo-core-function-map        地图相关的模块
-    - mogo-core-function-notice     云端公告、调度相关模块
-    - mogo-core-function-obu-mogo   自研OBU预警模块
-    - mogo-core-function-smp        小地图模块
-    - mogo-core-function-v2x        自车+云端预警模块
+    - mogo-core-function-check       程序及车辆检测模块
+    - mogo-core-function-devatools   开发工具模块
+    - mogo-core-function-hmi         UI呈现及交互模块
+    - mogo-core-function-main        主入口
+    - mogo-core-function-map         地图相关的模块
+    - mogo-core-function-monitoring  远距离监控查看，路测摄像头、前车直播
+    - mogo-core-function-notice      云端公告、调度相关模块
+    - mogo-core-function-obu-mogo    自研OBU预警模块
+    - mogo-core-function-smp         小地图模块
+    - mogo-core-function-v2x         自车+云端预警模块
 
 - mogo-core-data：定义基础业务所需要的数据结构
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -39,10 +39,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.*
 import com.mogo.map.MogoMap
-import com.mogo.utils.DeviceIdUtils
-import com.mogo.utils.NetworkUtils
-import com.mogo.utils.UiThreadHandler
-import com.mogo.utils.storage.SharedPrefsMgr
 import kotlinx.android.synthetic.main.view_debug_setting.view.*
 
 /**

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java

@@ -34,12 +34,10 @@ import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.eagle.core.data.map.MogoLatLng;
-import com.mogo.eagle.core.utilcode.mogo.glide.GlideApp;
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper;
 import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
-import com.mogo.eagle.core.utilcode.util.LaunchUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.listener.MogoMapListenerHandler;
@@ -75,9 +73,6 @@ import com.mogo.service.module.IMogoRegisterCenter;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.statusmanager.StatusDescriptor;
-import com.mogo.utils.UiThreadHandler;
-import com.mogo.utils.logger.Logger;
-import com.mogo.utils.storage.SharedPrefsMgr;
 
 import java.util.HashMap;
 import java.util.Map;