Merge branch 'dev/dev_eagle_architecture_upgrade' into dev/dev_eagle_wuhan_sikua_obu

.idea/gradle.xml

@@ -18,6 +18,7 @@
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/core" />
             <option value="$PROJECT_DIR$/core/function-impl" />
+            <option value="$PROJECT_DIR$/core/function-impl/mogo-core-function-check" />
             <option value="$PROJECT_DIR$/core/function-impl/mogo-core-function-hmi" />
             <option value="$PROJECT_DIR$/core/function-impl/mogo-core-function-obu-mogo" />
             <option value="$PROJECT_DIR$/core/function-impl/mogo-core-function-smp" />
@@ -42,7 +43,6 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-apps" />
             <option value="$PROJECT_DIR$/modules/mogo-module-authorize" />
             <option value="$PROJECT_DIR$/modules/mogo-module-back" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-check" />
             <option value="$PROJECT_DIR$/modules/mogo-module-common" />
             <option value="$PROJECT_DIR$/modules/mogo-module-extensions" />
             <option value="$PROJECT_DIR$/modules/mogo-module-left-panel" />

core/README.md

@@ -1,10 +1,20 @@
 ## 模块说明
 本模块用来编写鹰眼核型功能
 
-mogo-core-data：定义基础业务所需要的数据结构
-mogo-core-function-res：这里只存放公共资源，图片，布局，动画等
+- function-impl 目录下编写的都是对mogo-core-function-api定的功能实现,
+    - mogo-core-function-check      程序及车辆检测模块
+    - mogo-core-function-hmi        UI呈现及交互模块
+    - mogo-core-function-obu-mogo   自研OBU预警模块
+    - mogo-core-function-smp        小地图模块
 
-mogo-core-function-api：定义基础业务功能的接口
-mogo-core-function-impl：定义基础业务功能的接口的功能具体实现
+- mogo-core-data：定义基础业务所需要的数据结构
 
-mogo-core-function-call：定义基础业务暴露给外部调用的接口
+- mogo-core-function-res：这里只存放公共资源，图片，布局，动画等
+
+- mogo-core-function-api：定义基础业务功能的接口
+
+- mogo-core-function-call：定义基础业务暴露给外部调用的接口,对function-impl的二次封装,只将能对外调用的功能进行封装
+
+- mogo-core-res：程序中涉及到的图片及布局资源，同一管理，并通过设置不同的目录指定是那个模块的资源
+
+- mogo-core-utils：基于成熟的工具类开源框架下沉的，这里可以增添针对我们业务上的一些工具类

core/function-impl/mogo-core-function-check/build.gradle

@@ -51,17 +51,13 @@ dependencies {
     annotationProcessor rootProject.ext.dependencies.aroutercompiler
 
     if (Boolean.valueOf(RELEASE)) {
-        api rootProject.ext.dependencies.mogomap
-        api rootProject.ext.dependencies.mogomapapi
-        api rootProject.ext.dependencies.mogoutils
-        api rootProject.ext.dependencies.mogocommons
-        api rootProject.ext.dependencies.mogoserviceapi
+        implementation rootProject.ext.dependencies.mogocommons
+        implementation rootProject.ext.dependencies.mogoserviceapi
     } else {
-        api project(":libraries:mogo-map")
-        api project(":libraries:mogo-map-api")
-        api project(":foudations:mogo-utils")
-        api project(":foudations:mogo-commons")
-        api project(':services:mogo-service-api')
+        implementation project(":foudations:mogo-commons")
+        implementation project(':services:mogo-service-api')
+
+        implementation project(':core:mogo-core-utils')
     }
     implementation 'com.tencent.bugly:crashreport_upgrade:latest.release'
     //其中latest.release指代最新Bugly SDK版本号，也可以指定明确的版本号，例如2.1.9

core/function-impl/mogo-core-function-check/src/main/AndroidManifest.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.module.check">
+    package="com.mogo.eagle.core.function.check">
 
     <application>
         <activity
-            android:name=".view.CheckActivity"
+            android:name="com.mogo.eagle.core.function.check.view.CheckActivity"
             android:launchMode="singleTask"
             android:screenOrientation="landscape" />
     </application>

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/VehicleMonitoringManager.java

@@ -1,15 +1,13 @@
-package com.mogo.module.check;
+package com.mogo.eagle.core.function.check;
 
 import android.content.Context;
-import android.util.Log;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.map.check.IMogoCheckListener;
-import com.mogo.module.check.view.CheckActivity;
-import com.mogo.service.check.ICheckProvider;
+import com.mogo.eagle.core.utilcode.util.LogUtils;
+import com.mogo.eagle.core.function.api.check.IMogoCheckListener;
+import com.mogo.eagle.core.function.check.view.CheckActivity;
 import com.mogo.service.MogoServicePaths;
-import com.mogo.service.v2x.IV2XWarningListener;
-import com.mogo.utils.logger.Logger;
+import com.mogo.eagle.core.function.api.check.ICheckProvider;
 
 import java.util.List;
 import java.util.Map;
@@ -32,18 +30,18 @@ public class VehicleMonitoringManager implements ICheckProvider {
 
     @Override
     public void init(Context context) {
-        Logger.d(TAG, "初始化 CheckProvider 模块");
+        LogUtils.dTag(TAG, "初始化 CheckProvider 模块");
         mContext = context;
     }
 
     @Override
     public void registerVehicleMonitoringListener(String module, IMogoCheckListener listener) {
         if (listener == null || module == null) {
-            Log.d(TAG, "listener == null || intent == null");
+            LogUtils.dTag(TAG, "listener == null || intent == null");
             return;
         }
         if (!mListeners.containsKey(module)) {
-            Log.d(TAG, "intent==" + module + "listener" + listener);
+            LogUtils.dTag(TAG, "intent==" + module + "listener" + listener);
             mListeners.put(module, new CopyOnWriteArrayList<>());
         }
         mListeners.get(module).add(listener);

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/api/ICheckListener.java

@@ -1,4 +1,4 @@
-package com.mogo.module.check.api;
+package com.mogo.eagle.core.function.check.api;
 
 /**
  * @author liujing

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/api/SoftCheckApi.java

@@ -1,4 +1,4 @@
-package com.mogo.module.check.api;
+package com.mogo.eagle.core.function.check.api;
 
 /**
  * @author xiaoyuzhou

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/model/CheckItemInfo.java

@@ -1,6 +1,4 @@
-package com.mogo.module.check.model;
-
-import com.tencent.bugly.proguard.A;
+package com.mogo.eagle.core.function.check.model;
 
 import java.io.Serializable;
 import java.util.ArrayList;

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServiceFactory.java

@@ -1,4 +1,4 @@
-package com.mogo.module.check.net;
+package com.mogo.eagle.core.function.check.net;
 
 /**
  * @author liujing

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckApiServices.java

@@ -1,4 +1,4 @@
-package com.mogo.module.check.net;
+package com.mogo.eagle.core.function.check.net;
 
 import android.database.Observable;
 import java.util.Map;

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/net/CheckResultData.java

@@ -1,4 +1,4 @@
-package com.mogo.module.check.net;
+package com.mogo.eagle.core.function.check.net;
 
 import com.mogo.commons.data.BaseData;
 

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckActivity.java

@@ -1,4 +1,4 @@
-package com.mogo.module.check.view;
+package com.mogo.eagle.core.function.check.view;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -21,9 +21,8 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.mogo.commons.voice.AIAssist;
-import com.mogo.map.check.IMogoCheckListener;
-import com.mogo.module.check.R;
-import com.mogo.module.check.model.CheckItemInfo;
+import com.mogo.eagle.core.function.check.R;
+import com.mogo.eagle.core.function.check.model.CheckItemInfo;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.view.ImageViewClipBounds;
 import com.mogo.module.common.view.SpacesItemDecoration;

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckAdapter.java

@@ -1,4 +1,4 @@
-package com.mogo.module.check.view;
+package com.mogo.eagle.core.function.check.view;
 
 import android.content.Context;
 import android.content.Intent;
@@ -12,10 +12,8 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.mogo.module.check.R;
-import com.mogo.module.check.model.CheckItemInfo;
-import com.mogo.module.common.MogoApisHandler;
-import com.tencent.bugly.proguard.A;
+import com.mogo.eagle.core.function.check.R;
+import com.mogo.eagle.core.function.check.model.CheckItemInfo;
 
 import java.util.ArrayList;
 

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckDialog.java

@@ -1,4 +1,4 @@
-package com.mogo.module.check.view;
+package com.mogo.eagle.core.function.check.view;
 
 import android.content.Context;
 import android.view.View;
@@ -6,7 +6,7 @@ import android.widget.ImageView;
 
 import androidx.annotation.NonNull;
 
-import com.mogo.module.check.R;
+import com.mogo.eagle.core.function.check.R;
 import com.mogo.module.common.dialog.BaseFloatDialog;
 
 /**

core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function/check/view/CheckLinearLayout.java

@@ -1,12 +1,13 @@
-package com.mogo.module.check.view;
+package com.mogo.eagle.core.function.check.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.util.Log;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.mogo.eagle.core.utilcode.util.LogUtils;
+
 /**
  * @author liujing
  * @description 描述
@@ -30,7 +31,8 @@ class CheckLinearLayout extends LinearLayoutManager {
         try {
             super.onLayoutChildren(recycler, state);
         } catch (IndexOutOfBoundsException e) {
-            Log.d("CheckLinearLayout", "崩溃信息--" + e.toString());
+            e.printStackTrace();
+            LogUtils.dTag("CheckLinearLayout", "崩溃信息--" + e.toString());
         }
     }
 }

core/function-impl/mogo-core-function-check/src/main/res/layout/activity_check.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/blue_back_color"
-    tools:context=".view.CheckActivity">
+    tools:context="com.mogo.eagle.core.function.check.view.CheckActivity">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/check_list"

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/check/ICheckProvider.java

@@ -1,10 +1,8 @@
-package com.mogo.service.check;
+package com.mogo.eagle.core.function.api.check;
 
 import android.content.Context;
 
 import com.alibaba.android.arouter.facade.template.IProvider;
-import com.mogo.map.check.IMogoCheckListener;
-import com.mogo.service.datamanager.IMogoDataChangedListener;
 
 /**
  * 检测接口

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/check/IMogoCheckListener.java

@@ -1,4 +1,4 @@
-package com.mogo.map.check;
+package com.mogo.eagle.core.function.api.check;
 
 /**
  * @author liujing

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

@@ -35,7 +35,7 @@ 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.map.check.IMogoCheckListener;
+import com.mogo.eagle.core.function.api.check.IMogoCheckListener;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.location.IMogoLocationClient;
 import com.mogo.map.marker.IMogoMarkerManager;

services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java

@@ -7,7 +7,7 @@ import com.mogo.service.adas.IMogoADASController;
 import com.mogo.service.analytics.IMogoAnalytics;
 import com.mogo.service.auth.IMogoAuthManager;
 import com.mogo.service.cardmanager.IMogoCardManager;
-import com.mogo.service.check.ICheckProvider;
+import com.mogo.eagle.core.function.api.check.ICheckProvider;
 import com.mogo.service.cloud.socket.IMogoSocketManager;
 import com.mogo.service.cloud.socket.IMogoWebSocketManager;
 import com.mogo.service.datamanager.IMogoDataManager;

services/mogo-service-api/src/main/java/com/mogo/service/module/IMogoRegisterCenter.java

@@ -1,7 +1,6 @@
 package com.mogo.service.module;
 
 import com.alibaba.android.arouter.facade.template.IProvider;
-import com.mogo.map.check.IMogoCheckListener;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.location.IMogoLocationListener;
 import com.mogo.map.marker.IMogoMarkerClickListener;

services/mogo-service/build.gradle

@@ -59,7 +59,8 @@ dependencies {
         implementation project(":foudations:mogo-commons")
         implementation project(":services:mogo-service-api")
         implementation project(':modules:mogo-module-adas')
-        implementation project(':modules:mogo-module-check')
+
+        implementation project(':core:function-impl:mogo-core-function-check')
         implementation project(':core:mogo-core-data')
 
     }

services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java

@@ -11,7 +11,7 @@ import com.mogo.service.adas.IMogoADASController;
 import com.mogo.service.analytics.IMogoAnalytics;
 import com.mogo.service.auth.IMogoAuthManager;
 import com.mogo.service.cardmanager.IMogoCardManager;
-import com.mogo.service.check.ICheckProvider;
+import com.mogo.eagle.core.function.api.check.ICheckProvider;
 import com.mogo.service.cloud.socket.IMogoSocketManager;
 import com.mogo.service.cloud.socket.IMogoWebSocketManager;
 import com.mogo.service.datamanager.IMogoDataManager;

settings.gradle

@@ -23,6 +23,8 @@ include ':core:function-impl:mogo-core-function-hmi'
 include ':core:function-impl:mogo-core-function-smp'
 // 自研OBU业务
 include ':core:function-impl:mogo-core-function-obu-mogo'
+// 车辆及自动驾驶状态检测模块
+include ':core:function-impl:mogo-core-function-check'
 
 
 // 服务
@@ -48,7 +50,6 @@ include ':modules:mogo-module-left-panel-noop'
 include ':modules:mogo-module-left-panel'
 include ':modules:mogo-module-obu'
 include ':modules:mogo-module-adas'
-include ':modules:mogo-module-check'
 include ':modules:mogo-module-map'
 include ':modules:mogo-module-common'
 include ':modules:mogo-module-main'