From 451eb965df1e0160e7962b579703175d1c74106b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 17 Sep 2021 20:01:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- modules/mogo-module-check/build.gradle | 16 ++++++---------- .../module/check/VehicleMonitoringManager.java | 12 +++++------- .../mogo/module/check/model/CheckItemInfo.java | 2 -- .../mogo/module/check/view/CheckActivity.java | 1 - .../com/mogo/module/check/view/CheckAdapter.java | 2 -- .../module/check/view/CheckLinearLayout.java | 5 ++++- 6 files changed, 15 insertions(+), 23 deletions(-) diff --git a/modules/mogo-module-check/build.gradle b/modules/mogo-module-check/build.gradle index 990b1d3f1f..c5cd8c4b8e 100644 --- a/modules/mogo-module-check/build.gradle +++ b/modules/mogo-module-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 diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/VehicleMonitoringManager.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/VehicleMonitoringManager.java index bea2c7076a..e6493cf65a 100644 --- a/modules/mogo-module-check/src/main/java/com/mogo/module/check/VehicleMonitoringManager.java +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/VehicleMonitoringManager.java @@ -1,15 +1,13 @@ package com.mogo.module.check; import android.content.Context; -import android.util.Log; import com.alibaba.android.arouter.facade.annotation.Route; +import com.mogo.eagle.core.utilcode.util.LogUtils; import com.mogo.map.check.IMogoCheckListener; import com.mogo.module.check.view.CheckActivity; -import com.mogo.service.check.ICheckProvider; import com.mogo.service.MogoServicePaths; -import com.mogo.service.v2x.IV2XWarningListener; -import com.mogo.utils.logger.Logger; +import com.mogo.service.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); diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/model/CheckItemInfo.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/model/CheckItemInfo.java index d61d8e908b..08bc707392 100644 --- a/modules/mogo-module-check/src/main/java/com/mogo/module/check/model/CheckItemInfo.java +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/model/CheckItemInfo.java @@ -1,7 +1,5 @@ package com.mogo.module.check.model; -import com.tencent.bugly.proguard.A; - import java.io.Serializable; import java.util.ArrayList; diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java index f9afa2cc34..131090350f 100644 --- a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckActivity.java @@ -21,7 +21,6 @@ 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.module.common.MogoApisHandler; diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckAdapter.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckAdapter.java index b52ba88b14..224e648de5 100644 --- a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckAdapter.java +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckAdapter.java @@ -14,8 +14,6 @@ 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 java.util.ArrayList; diff --git a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckLinearLayout.java b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckLinearLayout.java index f29ced75ee..4d8ccc5eed 100644 --- a/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckLinearLayout.java +++ b/modules/mogo-module-check/src/main/java/com/mogo/module/check/view/CheckLinearLayout.java @@ -7,6 +7,8 @@ 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 +32,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()); } } } From b4c3a01896e753880665576372e084030bb85fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 17 Sep 2021 20:24:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=B9=B6=E4=BC=98=E5=8C=96=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 董宏宇 --- .idea/gradle.xml | 2 +- core/README.md | 20 +++++++++++++----- .../mogo-core-function-check}/.gitignore | 0 .../mogo-core-function-check}/README.md | 0 .../mogo-core-function-check}/build.gradle | 0 .../consumer-rules.pro | 0 .../gradle.properties | 0 .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 4 ++-- .../check/VehicleMonitoringManager.java | 8 +++---- .../function}/check/api/ICheckListener.java | 2 +- .../function}/check/api/SoftCheckApi.java | 2 +- .../function}/check/model/CheckItemInfo.java | 2 +- .../check/net/CheckApiServiceFactory.java | 2 +- .../function}/check/net/CheckApiServices.java | 2 +- .../function}/check/net/CheckResultData.java | 2 +- .../function}/check/view/CheckActivity.java | 6 +++--- .../function}/check/view/CheckAdapter.java | 6 +++--- .../function}/check/view/CheckDialog.java | 4 ++-- .../check/view/CheckLinearLayout.java | 3 +-- .../src/main/res/drawable/auto.png | Bin .../src/main/res/drawable/camera_unusual.png | Bin .../src/main/res/drawable/camera_usual.png | Bin .../src/main/res/drawable/check_button.xml | 0 .../main/res/drawable/check_chage_color.xml | 0 .../src/main/res/drawable/check_detail.xml | 0 .../main/res/drawable/check_dialog_back.xml | 0 .../res/drawable/check_list_item_back.xml | 0 .../main/res/drawable/check_little_btn.xml | 0 .../res/drawable/check_little_btn_green.xml | 0 .../src/main/res/drawable/check_progress.xml | 0 .../src/main/res/drawable/check_right.png | Bin .../main/res/drawable/check_scan_first.png | Bin .../main/res/drawable/check_scan_second.png | Bin .../src/main/res/drawable/check_scan_tips.png | Bin .../src/main/res/drawable/check_tip_image.png | Bin .../src/main/res/drawable/check_wrong.png | Bin .../main/res/drawable/jiaojiguang_usual.png | Bin .../src/main/res/drawable/luyouqi_unusual.png | Bin .../src/main/res/drawable/luyouqi_usual.png | Bin .../src/main/res/drawable/obu_unusual.png | Bin .../src/main/res/drawable/oub_usual.png | Bin .../src/main/res/drawable/pad_unusual.png | Bin .../src/main/res/drawable/rtk_unusual.png | Bin .../src/main/res/drawable/rtk_usual.png | Bin .../src/main/res/drawable/scan_tip_line.png | Bin .../src/main/res/drawable/yingyan.png | Bin .../main/res/drawable/zhujiguang_unusual.png | Bin .../main/res/drawable/zhujiguang_usual.png | Bin .../src/main/res/layout/activity_check.xml | 2 +- .../src/main/res/layout/check_dialog.xml | 0 .../src/main/res/layout/check_hardware.xml | 0 .../src/main/res/layout/check_list.xml | 0 .../src/main/res/layout/check_titel.xml | 0 .../res/values-xhdpi-2560x1600/dimens.xml | 0 .../src/main/res/values/colors.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 .../function/api}/check/ICheckProvider.java | 4 +--- .../api}/check/IMogoCheckListener.java | 2 +- .../extensions/entrance/EntranceFragment.java | 2 +- .../com/mogo/service/IMogoServiceApis.java | 2 +- .../service/module/IMogoRegisterCenter.java | 1 - services/mogo-service/build.gradle | 3 ++- .../mogo/service/impl/MogoServiceApis.java | 2 +- settings.gradle | 3 ++- 66 files changed, 47 insertions(+), 39 deletions(-) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/.gitignore (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/README.md (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/build.gradle (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/consumer-rules.pro (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/gradle.properties (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/proguard-rules.pro (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/AndroidManifest.xml (67%) rename {modules/mogo-module-check/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function}/check/VehicleMonitoringManager.java (91%) rename {modules/mogo-module-check/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function}/check/api/ICheckListener.java (87%) rename {modules/mogo-module-check/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function}/check/api/SoftCheckApi.java (88%) rename {modules/mogo-module-check/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function}/check/model/CheckItemInfo.java (98%) rename {modules/mogo-module-check/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function}/check/net/CheckApiServiceFactory.java (69%) rename {modules/mogo-module-check/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function}/check/net/CheckApiServices.java (88%) rename {modules/mogo-module-check/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function}/check/net/CheckResultData.java (76%) rename {modules/mogo-module-check/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function}/check/view/CheckActivity.java (99%) rename {modules/mogo-module-check/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function}/check/view/CheckAdapter.java (98%) rename {modules/mogo-module-check/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function}/check/view/CheckDialog.java (93%) rename {modules/mogo-module-check/src/main/java/com/mogo/module => core/function-impl/mogo-core-function-check/src/main/java/com/mogo/eagle/core/function}/check/view/CheckLinearLayout.java (94%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/auto.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/camera_unusual.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/camera_usual.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/check_button.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/check_chage_color.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/check_detail.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/check_dialog_back.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/check_list_item_back.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/check_little_btn.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/check_little_btn_green.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/check_progress.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/check_right.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/check_scan_first.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/check_scan_second.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/check_scan_tips.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/check_tip_image.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/check_wrong.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/jiaojiguang_usual.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/luyouqi_unusual.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/luyouqi_usual.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/obu_unusual.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/oub_usual.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/pad_unusual.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/rtk_unusual.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/rtk_usual.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/scan_tip_line.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/yingyan.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/zhujiguang_unusual.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/drawable/zhujiguang_usual.png (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/layout/activity_check.xml (98%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/layout/check_dialog.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/layout/check_hardware.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/layout/check_list.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/layout/check_titel.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/values-xhdpi-2560x1600/dimens.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/values/colors.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/values/strings.xml (100%) rename {modules/mogo-module-check => core/function-impl/mogo-core-function-check}/src/main/res/values/styles.xml (100%) rename {services/mogo-service-api/src/main/java/com/mogo/service => core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api}/check/ICheckProvider.java (86%) rename {libraries/mogo-map-api/src/main/java/com/mogo/map => core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api}/check/IMogoCheckListener.java (82%) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7b6fd7b2be..c23be79b9d 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -18,6 +18,7 @@