From 98ab5abb1b4bc944deedb1f52f307ae46ecb55fa Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 22 Dec 2021 16:48:24 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=E6=8A=8A=E5=85=AC=E5=91=8A=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E9=80=BB=E8=BE=91=E6=8C=AA=E5=88=B0core/notice?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/main/MainMoGoApplication.java | 2 +- .../mogo-core-function-notice/build.gradle | 11 +++- .../eagle/core/function/notice}/Config.kt | 2 +- .../notice}/PushHistoryUiProvider.java | 5 +- .../function/notice}/PushModuleProvider.java | 7 +-- .../core/function/notice/PushUIConstants.java | 7 +++ .../notice}/adapter/PushMessageAdapter.kt | 13 ++-- .../core/function/notice}/dao/PushBeanDao.kt | 4 +- .../function/notice}/dao/PushBeanDatabase.kt | 4 +- .../fragment/MessageHistoryFragment.java | 24 ++++---- .../fragment/MessageHistoryPresenter.java | 3 +- .../notice}/fragment/MessageHistoryView.java | 2 +- .../core/function/notice}/model/PushBean.kt | 3 +- .../notice/network/NoticeApiService.java | 2 - .../notice}/repository/PushRepository.kt | 17 +++-- .../function/notice}/utils/AnalyticsUtils.kt | 4 +- .../function/notice}/utils/AnimatorUtils.kt | 2 +- .../function/notice}/utils/HandlerUtils.kt | 2 +- .../function/notice}/utils/SchemaUtils.kt | 2 +- .../core/function/notice}/utils/Utils.kt | 2 +- .../core/function/notice}/view/FloatView.kt | 19 +++--- .../core/function/notice}/view/GlobalTools.kt | 3 +- .../function/notice}/view/PushCheckDialog.kt | 4 +- .../notice}/view/PushItemAnimator.java | 2 +- .../notice}/view/SwipeItemLayout.java | 2 +- .../notice}/view/roundimage/Corner.java | 2 +- .../view/roundimage/RoundedDrawable.java | 2 +- .../view/roundimage/RoundedImageView.java | 5 +- .../notice}/viewmodel/MessageViewModel.kt | 8 +-- .../notice}/viewmodel/PushViewModel.kt | 14 ++--- .../res/drawable-ldpi/module_push_close.png | Bin .../module_push_item_background_p.9.png | Bin .../module_push_message_background.9.png | Bin .../res/drawable-mdpi/module_push_close.png | Bin .../module_push_item_background_p.9.png | Bin .../module_push_message_background.9.png | Bin .../res/drawable-xhdpi/module_push_close.png | Bin .../module_push_dialog_close.png | Bin .../module_push_item_background_p.9.png | Bin .../module_push_message_background.9.png | Bin .../res/drawable/module_push_clear_bg.xml | 0 .../main/res/drawable/module_push_close.png | Bin .../module_push_content_background.xml | 2 +- .../module_push_decrease_timer_bkg.xml | 0 .../module_push_dialog_check_background.xml | 0 .../drawable/module_push_item_background.xml | 4 +- .../module_push_item_background_origin.xml | 0 .../res/drawable/module_push_left_button.xml | 0 .../module_push_message_background.9.png | Bin .../module_push_recycler_item_background.xml | 0 .../res/drawable/module_push_right_button.xml | 0 .../module_push_ui_delay_background.xml | 0 .../drawable/module_push_ui_ic_message2.png | Bin .../res/layout/module_push_dialog_check.xml | 2 - .../src/main/res/layout/module_push_item.xml | 27 ++++---- .../res/layout/module_push_item_origin.xml | 2 +- .../res/layout/module_push_item_vertical.xml | 0 .../module_push_message_hisotry_fragment.xml | 0 .../res/layout/module_push_message_item.xml | 0 .../src/main/res/values-ldpi}/dimens.xml | 1 - .../src/main/res/values-mdpi}/dimens.xml | 1 - .../res/values-xhdpi-2560x1440/dimens.xml | 3 +- .../src/main/res/values-xhdpi/dimens.xml | 1 - .../src/main/res/values/attr.xml | 58 +++++++++--------- .../src/main/res/values/colors.xml | 2 +- .../src/main/res/values/dimens.xml | 3 +- .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 68 files changed, 144 insertions(+), 141 deletions(-) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/Config.kt (95%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/PushHistoryUiProvider.java (87%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/PushModuleProvider.java (90%) create mode 100644 core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/PushUIConstants.java rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/adapter/PushMessageAdapter.kt (93%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/dao/PushBeanDao.kt (83%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/dao/PushBeanDatabase.kt (66%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/fragment/MessageHistoryFragment.java (89%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/fragment/MessageHistoryPresenter.java (83%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/fragment/MessageHistoryView.java (74%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/model/PushBean.kt (94%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/repository/PushRepository.kt (93%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/utils/AnalyticsUtils.kt (85%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/utils/AnimatorUtils.kt (94%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/utils/HandlerUtils.kt (84%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/utils/SchemaUtils.kt (98%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/utils/Utils.kt (95%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/view/FloatView.kt (97%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/view/GlobalTools.kt (90%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/view/PushCheckDialog.kt (91%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/view/PushItemAnimator.java (99%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/view/SwipeItemLayout.java (99%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/view/roundimage/Corner.java (85%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/view/roundimage/RoundedDrawable.java (99%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/view/roundimage/RoundedImageView.java (99%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/viewmodel/MessageViewModel.kt (72%) rename {modules/mogo-module-push/src/main/java/com/mogo/module/push => core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice}/viewmodel/PushViewModel.kt (93%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable-ldpi/module_push_close.png (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable-ldpi/module_push_item_background_p.9.png (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable-ldpi/module_push_message_background.9.png (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable-mdpi/module_push_close.png (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable-mdpi/module_push_item_background_p.9.png (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable-mdpi/module_push_message_background.9.png (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable-xhdpi/module_push_close.png (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable-xhdpi/module_push_dialog_close.png (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable-xhdpi/module_push_item_background_p.9.png (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable-xhdpi/module_push_message_background.9.png (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable/module_push_clear_bg.xml (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable/module_push_close.png (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable/module_push_content_background.xml (85%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable/module_push_decrease_timer_bkg.xml (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable/module_push_dialog_check_background.xml (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable/module_push_item_background.xml (82%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable/module_push_item_background_origin.xml (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable/module_push_left_button.xml (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable/module_push_message_background.9.png (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable/module_push_recycler_item_background.xml (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable/module_push_right_button.xml (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable/module_push_ui_delay_background.xml (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/drawable/module_push_ui_ic_message2.png (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/layout/module_push_dialog_check.xml (96%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/layout/module_push_item.xml (81%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/layout/module_push_item_origin.xml (98%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/layout/module_push_item_vertical.xml (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/layout/module_push_message_hisotry_fragment.xml (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/layout/module_push_message_item.xml (100%) rename {modules/mogo-module-push/src/main/res/values-mdpi => core/function-impl/mogo-core-function-notice/src/main/res/values-ldpi}/dimens.xml (98%) rename {modules/mogo-module-push/src/main/res/values-ldpi => core/function-impl/mogo-core-function-notice/src/main/res/values-mdpi}/dimens.xml (98%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/values-xhdpi-2560x1440/dimens.xml (94%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/values-xhdpi/dimens.xml (98%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/values/attr.xml (97%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/values/colors.xml (87%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/values/dimens.xml (98%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/values/strings.xml (100%) rename {modules/mogo-module-push => core/function-impl/mogo-core-function-notice}/src/main/res/values/styles.xml (100%) diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index 28c0e044d5..614073df92 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -18,6 +18,7 @@ import com.mogo.commons.network.Utils; import com.mogo.eagle.core.data.constants.MoGoConfig; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.data.map.MogoLocation; +import com.mogo.eagle.core.function.notice.PushUIConstants; import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils; import com.mogo.map.MapApiPath; import com.mogo.module.carchatting.card.CallChatConstant; @@ -26,7 +27,6 @@ import com.mogo.module.common.MogoModule; import com.mogo.module.common.MogoModulePaths; import com.mogo.module.common.constants.HostConst; import com.mogo.module.main.service.MogoMainService; -import com.mogo.module.push.base.PushUIConstants; import com.mogo.module.service.ServiceConst; import com.mogo.module.share.constant.ShareConstants; import com.mogo.module.v2x.V2XConst; diff --git a/core/function-impl/mogo-core-function-notice/build.gradle b/core/function-impl/mogo-core-function-notice/build.gradle index 88eab8a51a..8e04efb4cf 100644 --- a/core/function-impl/mogo-core-function-notice/build.gradle +++ b/core/function-impl/mogo-core-function-notice/build.gradle @@ -38,6 +38,9 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + kotlinOptions { + jvmTarget = "1.8" + } } dependencies { @@ -48,7 +51,11 @@ dependencies { implementation rootProject.ext.dependencies.androidxconstraintlayout implementation rootProject.ext.dependencies.arouter implementation rootProject.ext.dependencies.rxandroid - + implementation rootProject.ext.dependencies.androidxrecyclerview + implementation rootProject.ext.dependencies.androidxroomruntime + implementation rootProject.ext.dependencies.androidxroomktx + implementation rootProject.ext.dependencies.litezxing + kapt rootProject.ext.dependencies.androidxroomcompiler kapt rootProject.ext.dependencies.aroutercompiler if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { @@ -61,6 +68,7 @@ dependencies { implementation rootProject.ext.dependencies.mogo_core_res implementation rootProject.ext.dependencies.mogo_core_network implementation rootProject.ext.dependencies.mogo_core_function_call + implementation rootProject.ext.dependencies.mogoutils } else { implementation project(":foudations:mogo-commons") implementation project(':services:mogo-service-api') @@ -71,6 +79,7 @@ dependencies { implementation project(':core:mogo-core-res') implementation project(':core:mogo-core-network') implementation project(':core:mogo-core-function-call') + implementation project(':foudations:mogo-utils') } } diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/Config.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/Config.kt similarity index 95% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/Config.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/Config.kt index d5de33e9d7..bfcef3d240 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/Config.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/Config.kt @@ -1,4 +1,4 @@ -package com.mogo.module.push +package com.mogo.eagle.core.function.notice object Config { const val PUSH_TYPE = 100 //注册长连接类型 diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/PushHistoryUiProvider.java similarity index 87% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/PushHistoryUiProvider.java index 0b5b84d790..860f19b2c1 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushHistoryUiProvider.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/PushHistoryUiProvider.java @@ -1,4 +1,4 @@ -package com.mogo.module.push; +package com.mogo.eagle.core.function.notice; import android.content.Context; import android.os.Bundle; @@ -7,8 +7,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentActivity; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.module.push.base.PushUIConstants; -import com.mogo.module.push.fragment.MessageHistoryFragment; +import com.mogo.eagle.core.function.notice.fragment.MessageHistoryFragment; import com.mogo.service.fragmentmanager.IFragmentProvider; public diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushModuleProvider.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/PushModuleProvider.java similarity index 90% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/PushModuleProvider.java rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/PushModuleProvider.java index d2f30c05d9..3f5cf54521 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/PushModuleProvider.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/PushModuleProvider.java @@ -1,4 +1,4 @@ -package com.mogo.module.push; +package com.mogo.eagle.core.function.notice; import android.content.Context; import android.os.Bundle; @@ -12,9 +12,8 @@ import com.mogo.map.listener.IMogoMapListener; import com.mogo.map.location.IMogoLocationListener; import com.mogo.map.marker.IMogoMarkerClickListener; import com.mogo.map.navi.IMogoNaviListener; -import com.mogo.module.push.base.PushUIConstants; -import com.mogo.module.push.repository.PushRepository; -import com.mogo.module.push.utils.HandlerUtils; +import com.mogo.eagle.core.function.notice.repository.PushRepository; +import com.mogo.eagle.core.function.notice.utils.HandlerUtils; import com.mogo.service.module.IMogoModuleLifecycle; import com.mogo.service.module.IMogoModuleProvider; diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/PushUIConstants.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/PushUIConstants.java new file mode 100644 index 0000000000..1668aae7d1 --- /dev/null +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/PushUIConstants.java @@ -0,0 +1,7 @@ +package com.mogo.eagle.core.function.notice; + +public class PushUIConstants { + public static final String NAME = "PUSH_UI"; + public static final String PATH = "/push/ui"; + public static final String Push_MESSAGE_ACTIVITY_PATH = "/push/ui/message"; //消息列表activity +} diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/adapter/PushMessageAdapter.kt similarity index 93% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/adapter/PushMessageAdapter.kt index b920fedc77..a097fe9fb3 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/adapter/PushMessageAdapter.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/adapter/PushMessageAdapter.kt @@ -1,16 +1,15 @@ -package com.mogo.module.push.adapter +package com.mogo.eagle.core.function.notice.adapter import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.mogo.module.push.R -import com.mogo.module.push.model.PushBean -import com.mogo.module.push.repository.PushRepository -import com.mogo.module.push.utils.dealSchema -import com.mogo.module.push.utils.stringConverterBitmap -import com.mogo.module.push.view.getApis +import com.mogo.eagle.core.function.notice.R +import com.mogo.eagle.core.function.notice.model.PushBean +import com.mogo.eagle.core.function.notice.utils.dealSchema +import com.mogo.eagle.core.function.notice.utils.stringConverterBitmap +import com.mogo.eagle.core.function.notice.view.getApis import com.mogo.service.imageloader.MogoImageView import kotlin.math.abs diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/dao/PushBeanDao.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/dao/PushBeanDao.kt similarity index 83% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/dao/PushBeanDao.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/dao/PushBeanDao.kt index ff2548093d..3b84c249b5 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/dao/PushBeanDao.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/dao/PushBeanDao.kt @@ -1,7 +1,7 @@ -package com.mogo.module.push.dao +package com.mogo.eagle.core.function.notice.dao import androidx.room.* -import com.mogo.module.push.model.PushBean +import com.mogo.eagle.core.function.notice.model.PushBean @Dao interface PushBeanDao { diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/dao/PushBeanDatabase.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/dao/PushBeanDatabase.kt similarity index 66% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/dao/PushBeanDatabase.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/dao/PushBeanDatabase.kt index 7631c88a18..178a980271 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/dao/PushBeanDatabase.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/dao/PushBeanDatabase.kt @@ -1,8 +1,8 @@ -package com.mogo.module.push.dao +package com.mogo.eagle.core.function.notice.dao import androidx.room.Database import androidx.room.RoomDatabase -import com.mogo.module.push.model.PushBean +import com.mogo.eagle.core.function.notice.model.PushBean @Database(entities = [PushBean::class], version = 1) abstract class PushBeanDatabase : RoomDatabase() { diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryFragment.java similarity index 89% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryFragment.java index a7386aa260..be181b21f8 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryFragment.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryFragment.java @@ -1,4 +1,4 @@ -package com.mogo.module.push.fragment; +package com.mogo.eagle.core.function.notice.fragment; import android.view.View; import android.widget.TextView; @@ -10,18 +10,18 @@ import androidx.recyclerview.widget.RecyclerView; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.analytics.AnalyticsUtils; import com.mogo.commons.mvp.MvpFragment; +import com.mogo.eagle.core.function.notice.R; +import com.mogo.eagle.core.function.notice.utils.AnimatorUtilsKt; +import com.mogo.eagle.core.function.notice.view.GlobalToolsKt; +import com.mogo.eagle.core.function.notice.view.PushItemAnimator; +import com.mogo.eagle.core.function.notice.view.SwipeItemLayout; import com.mogo.module.common.view.OnPreventFastClickListener; -import com.mogo.module.push.Config; -import com.mogo.module.push.R; -import com.mogo.module.push.adapter.PushMessageAdapter; -import com.mogo.module.push.model.PushBean; -import com.mogo.module.push.repository.PushRepository; -import com.mogo.module.push.utils.AnimatorUtilsKt; -import com.mogo.module.push.utils.HandlerUtils; -import com.mogo.module.push.view.GlobalToolsKt; -import com.mogo.module.push.view.PushItemAnimator; -import com.mogo.module.push.view.SwipeItemLayout; -import com.mogo.module.push.viewmodel.MessageViewModel; +import com.mogo.eagle.core.function.notice.Config; +import com.mogo.eagle.core.function.notice.adapter.PushMessageAdapter; +import com.mogo.eagle.core.function.notice.model.PushBean; +import com.mogo.eagle.core.function.notice.repository.PushRepository; +import com.mogo.eagle.core.function.notice.utils.HandlerUtils; +import com.mogo.eagle.core.function.notice.viewmodel.MessageViewModel; import com.mogo.service.statusmanager.IMogoMsgCenterListener; import com.mogo.utils.UiThreadHandler; diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryPresenter.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryPresenter.java similarity index 83% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryPresenter.java rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryPresenter.java index 836da23c93..a957d2eb12 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryPresenter.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryPresenter.java @@ -1,4 +1,5 @@ -package com.mogo.module.push.fragment; +package com.mogo.eagle.core.function.notice.fragment; + import com.mogo.commons.mvp.Presenter; diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryView.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryView.java similarity index 74% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryView.java rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryView.java index 4ad76d5b6b..a4f66d8d23 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/fragment/MessageHistoryView.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/fragment/MessageHistoryView.java @@ -1,4 +1,4 @@ -package com.mogo.module.push.fragment; +package com.mogo.eagle.core.function.notice.fragment; import com.mogo.commons.mvp.IView; diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/model/PushBean.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/model/PushBean.kt similarity index 94% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/model/PushBean.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/model/PushBean.kt index 452a62f19e..a0660c6325 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/model/PushBean.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/model/PushBean.kt @@ -1,10 +1,9 @@ -package com.mogo.module.push.model +package com.mogo.eagle.core.function.notice.model import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.Ignore import androidx.room.PrimaryKey -import com.google.gson.annotations.SerializedName @Entity data class PushBean( diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeApiService.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeApiService.java index bb4ca9592f..b494c507c2 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeApiService.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/network/NoticeApiService.java @@ -9,8 +9,6 @@ import java.util.Map; import io.reactivex.Observable; import okhttp3.RequestBody; import retrofit2.http.Body; -import retrofit2.http.FieldMap; -import retrofit2.http.FormUrlEncoded; import retrofit2.http.GET; import retrofit2.http.Headers; import retrofit2.http.POST; diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/repository/PushRepository.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/repository/PushRepository.kt similarity index 93% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/repository/PushRepository.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/repository/PushRepository.kt index 6562c109c5..204d42de99 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/repository/PushRepository.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/repository/PushRepository.kt @@ -1,19 +1,16 @@ -package com.mogo.module.push.repository +package com.mogo.eagle.core.function.notice.repository import android.content.Context import android.os.Handler import android.os.Looper import android.util.Log import androidx.room.Room -import com.mogo.module.push.Config -import com.mogo.module.push.base.PushUIConstants -import com.mogo.module.push.dao.PushBeanDatabase -import com.mogo.module.push.model.PushBean -import com.mogo.module.push.utils.AnalyticsUtils -import com.mogo.module.push.utils.HandlerUtils -import com.mogo.module.push.view.getApis -import com.mogo.module.push.viewmodel.PushViewModel -import com.mogo.service.cloud.socket.IMogoOnMessageListener +import com.mogo.eagle.core.function.notice.PushUIConstants +import com.mogo.eagle.core.function.notice.dao.PushBeanDatabase +import com.mogo.eagle.core.function.notice.model.PushBean +import com.mogo.eagle.core.function.notice.utils.HandlerUtils +import com.mogo.eagle.core.function.notice.view.getApis +import com.mogo.eagle.core.function.notice.viewmodel.PushViewModel import com.mogo.service.statusmanager.IMogoStatusChangedListener import com.mogo.service.statusmanager.StatusDescriptor import com.mogo.utils.logger.Logger diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/AnalyticsUtils.kt similarity index 85% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/AnalyticsUtils.kt index f5ba9821cf..5c3025829a 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnalyticsUtils.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/AnalyticsUtils.kt @@ -1,10 +1,10 @@ @file:Suppress("DEPRECATION") -package com.mogo.module.push.utils +package com.mogo.eagle.core.function.notice.utils import android.util.ArrayMap import com.alibaba.android.arouter.launcher.ARouter -import com.mogo.module.push.repository.PushRepository +import com.mogo.eagle.core.function.notice.repository.PushRepository import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.service.analytics.IMogoAnalytics diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnimatorUtils.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/AnimatorUtils.kt similarity index 94% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnimatorUtils.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/AnimatorUtils.kt index bdbb7f46e3..e257d3dfa3 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/AnimatorUtils.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/AnimatorUtils.kt @@ -1,4 +1,4 @@ -package com.mogo.module.push.utils +package com.mogo.eagle.core.function.notice.utils import android.view.View import android.view.ViewGroup diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/HandlerUtils.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/HandlerUtils.kt similarity index 84% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/HandlerUtils.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/HandlerUtils.kt index 06ee277f7c..6ccb309b27 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/HandlerUtils.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/HandlerUtils.kt @@ -1,4 +1,4 @@ -package com.mogo.module.push.utils +package com.mogo.eagle.core.function.notice.utils import android.os.Handler import android.os.HandlerThread diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/SchemaUtils.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/SchemaUtils.kt similarity index 98% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/SchemaUtils.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/SchemaUtils.kt index 750c9256f0..64abcbcbbe 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/SchemaUtils.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/SchemaUtils.kt @@ -1,4 +1,4 @@ -package com.mogo.module.push.utils +package com.mogo.eagle.core.function.notice.utils import android.content.Context import android.content.Intent diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/Utils.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/Utils.kt similarity index 95% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/Utils.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/Utils.kt index 8bdfa03869..3fb22c1293 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/utils/Utils.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/utils/Utils.kt @@ -1,4 +1,4 @@ -package com.mogo.module.push.utils +package com.mogo.eagle.core.function.notice.utils import android.graphics.Bitmap import com.google.zxing.EncodeHintType diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/FloatView.kt similarity index 97% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/FloatView.kt index 41b486d196..1ea4590aed 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/FloatView.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/FloatView.kt @@ -1,4 +1,4 @@ -package com.mogo.module.push.view +package com.mogo.eagle.core.function.notice.view import android.content.Context import android.os.Handler @@ -10,21 +10,18 @@ import android.widget.Scroller import android.widget.TextView import androidx.annotation.LayoutRes import com.mogo.commons.context.ContextHolderUtil -import com.mogo.commons.voice.AIAssist -import com.mogo.module.push.Config -import com.mogo.module.push.R -import com.mogo.module.push.model.PushBean -import com.mogo.module.push.utils.AnalyticsUtils -import com.mogo.module.push.utils.stringConverterBitmap -import com.mogo.module.push.view.roundimage.RoundedImageView -import com.mogo.module.push.viewmodel.PushViewModel +import com.mogo.eagle.core.function.notice.Config +import com.mogo.eagle.core.function.notice.R +import com.mogo.eagle.core.function.notice.model.PushBean +import com.mogo.eagle.core.function.notice.utils.AnalyticsUtils +import com.mogo.eagle.core.function.notice.utils.stringConverterBitmap +import com.mogo.eagle.core.function.notice.view.roundimage.RoundedImageView +import com.mogo.eagle.core.function.notice.viewmodel.PushViewModel import com.mogo.service.windowview.IMogoTopViewManager import com.mogo.service.windowview.IMogoTopViewStatusListener import com.mogo.utils.ThreadPoolService import com.mogo.utils.UiThreadHandler import com.mogo.utils.glide.GlideApp -import com.mogo.utils.logger.Logger -import kotlin.math.log class FloatView constructor( private val pushViewModel: PushViewModel, diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/GlobalTools.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/GlobalTools.kt similarity index 90% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/view/GlobalTools.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/GlobalTools.kt index 469916e914..888af184d2 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/GlobalTools.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/GlobalTools.kt @@ -1,10 +1,9 @@ -package com.mogo.module.push.view +package com.mogo.eagle.core.function.notice.view import android.content.Context import android.view.View import com.alibaba.android.arouter.launcher.ARouter import com.mogo.service.IMogoServiceApis -import com.mogo.eagle.core.data.constants.MogoServicePaths /** * @author congtaowang diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/PushCheckDialog.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/PushCheckDialog.kt similarity index 91% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/view/PushCheckDialog.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/PushCheckDialog.kt index 8d4f47a7c2..4dad7cfbda 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/PushCheckDialog.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/PushCheckDialog.kt @@ -1,10 +1,10 @@ -package com.mogo.module.push.view +package com.mogo.eagle.core.function.notice.view import android.content.Context import android.widget.ImageView import android.widget.TextView +import com.mogo.eagle.core.function.notice.R import com.mogo.module.common.dialog.BaseFloatDialog -import com.mogo.module.push.R class PushCheckDialog(context: Context) : BaseFloatDialog(context) { diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/PushItemAnimator.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/PushItemAnimator.java similarity index 99% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/view/PushItemAnimator.java rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/PushItemAnimator.java index 20a603751e..c3013625bf 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/PushItemAnimator.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/PushItemAnimator.java @@ -1,4 +1,4 @@ -package com.mogo.module.push.view; +package com.mogo.eagle.core.function.notice.view; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/SwipeItemLayout.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/SwipeItemLayout.java similarity index 99% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/view/SwipeItemLayout.java rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/SwipeItemLayout.java index 2f68af07c6..c605c482a7 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/SwipeItemLayout.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/SwipeItemLayout.java @@ -1,4 +1,4 @@ -package com.mogo.module.push.view; +package com.mogo.eagle.core.function.notice.view; import android.content.Context; import android.util.AttributeSet; diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/Corner.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/roundimage/Corner.java similarity index 85% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/Corner.java rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/roundimage/Corner.java index 86900b2810..74bc366c66 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/Corner.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/roundimage/Corner.java @@ -1,4 +1,4 @@ -package com.mogo.module.push.view.roundimage; +package com.mogo.eagle.core.function.notice.view.roundimage; import androidx.annotation.IntDef; diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/RoundedDrawable.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/roundimage/RoundedDrawable.java similarity index 99% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/RoundedDrawable.java rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/roundimage/RoundedDrawable.java index 0561fb8285..6cf48344ae 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/RoundedDrawable.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/roundimage/RoundedDrawable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mogo.module.push.view.roundimage; +package com.mogo.eagle.core.function.notice.view.roundimage; import android.content.res.ColorStateList; import android.graphics.Bitmap; diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/RoundedImageView.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/roundimage/RoundedImageView.java similarity index 99% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/RoundedImageView.java rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/roundimage/RoundedImageView.java index 9b2afdaa5b..014624e511 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/view/roundimage/RoundedImageView.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/view/roundimage/RoundedImageView.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.mogo.module.push.view.roundimage; +package com.mogo.eagle.core.function.notice.view.roundimage; import android.content.Context; import android.content.res.ColorStateList; @@ -36,7 +36,8 @@ import androidx.annotation.DimenRes; import androidx.annotation.DrawableRes; import androidx.appcompat.widget.AppCompatImageView; -import com.mogo.module.push.R; +import com.mogo.eagle.core.function.notice.R; + @SuppressWarnings("UnusedDeclaration") public class RoundedImageView extends AppCompatImageView { diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/viewmodel/MessageViewModel.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/viewmodel/MessageViewModel.kt similarity index 72% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/viewmodel/MessageViewModel.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/viewmodel/MessageViewModel.kt index a5f6da8766..fee24db6bc 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/viewmodel/MessageViewModel.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/viewmodel/MessageViewModel.kt @@ -1,8 +1,8 @@ -package com.mogo.module.push.viewmodel +package com.mogo.eagle.core.function.notice.viewmodel -import com.mogo.module.push.model.PushBean -import com.mogo.module.push.repository.PushRepository -import com.mogo.module.push.utils.HandlerUtils +import com.mogo.eagle.core.function.notice.model.PushBean +import com.mogo.eagle.core.function.notice.repository.PushRepository +import com.mogo.eagle.core.function.notice.utils.HandlerUtils class MessageViewModel(private val messageViewModel: MessageListChange) { diff --git a/modules/mogo-module-push/src/main/java/com/mogo/module/push/viewmodel/PushViewModel.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/viewmodel/PushViewModel.kt similarity index 93% rename from modules/mogo-module-push/src/main/java/com/mogo/module/push/viewmodel/PushViewModel.kt rename to core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/viewmodel/PushViewModel.kt index 9651719a24..b6565e7570 100644 --- a/modules/mogo-module-push/src/main/java/com/mogo/module/push/viewmodel/PushViewModel.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/viewmodel/PushViewModel.kt @@ -1,16 +1,16 @@ -package com.mogo.module.push.viewmodel +package com.mogo.eagle.core.function.notice.viewmodel import android.content.Context import android.text.TextUtils import android.util.Log import com.mogo.commons.voice.AIAssist import com.mogo.commons.voice.IMogoVoiceCmdCallBack -import com.mogo.module.push.Config -import com.mogo.module.push.model.PushBean -import com.mogo.module.push.repository.PushRepository -import com.mogo.module.push.utils.AnalyticsUtils -import com.mogo.module.push.utils.dealSchema -import com.mogo.module.push.view.FloatView +import com.mogo.eagle.core.function.notice.Config +import com.mogo.eagle.core.function.notice.model.PushBean +import com.mogo.eagle.core.function.notice.repository.PushRepository +import com.mogo.eagle.core.function.notice.utils.AnalyticsUtils +import com.mogo.eagle.core.function.notice.utils.dealSchema +import com.mogo.eagle.core.function.notice.view.FloatView class PushViewModel( private val mContext: Context, diff --git a/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_close.png b/core/function-impl/mogo-core-function-notice/src/main/res/drawable-ldpi/module_push_close.png similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_close.png rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable-ldpi/module_push_close.png diff --git a/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_item_background_p.9.png b/core/function-impl/mogo-core-function-notice/src/main/res/drawable-ldpi/module_push_item_background_p.9.png similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_item_background_p.9.png rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable-ldpi/module_push_item_background_p.9.png diff --git a/modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png b/core/function-impl/mogo-core-function-notice/src/main/res/drawable-ldpi/module_push_message_background.9.png similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable-ldpi/module_push_message_background.9.png rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable-ldpi/module_push_message_background.9.png diff --git a/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_close.png b/core/function-impl/mogo-core-function-notice/src/main/res/drawable-mdpi/module_push_close.png similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_close.png rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable-mdpi/module_push_close.png diff --git a/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_item_background_p.9.png b/core/function-impl/mogo-core-function-notice/src/main/res/drawable-mdpi/module_push_item_background_p.9.png similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_item_background_p.9.png rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable-mdpi/module_push_item_background_p.9.png diff --git a/modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png b/core/function-impl/mogo-core-function-notice/src/main/res/drawable-mdpi/module_push_message_background.9.png similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable-mdpi/module_push_message_background.9.png rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable-mdpi/module_push_message_background.9.png diff --git a/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_close.png b/core/function-impl/mogo-core-function-notice/src/main/res/drawable-xhdpi/module_push_close.png similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_close.png rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable-xhdpi/module_push_close.png diff --git a/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_dialog_close.png b/core/function-impl/mogo-core-function-notice/src/main/res/drawable-xhdpi/module_push_dialog_close.png similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_dialog_close.png rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable-xhdpi/module_push_dialog_close.png diff --git a/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_item_background_p.9.png b/core/function-impl/mogo-core-function-notice/src/main/res/drawable-xhdpi/module_push_item_background_p.9.png similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_item_background_p.9.png rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable-xhdpi/module_push_item_background_p.9.png diff --git a/modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png b/core/function-impl/mogo-core-function-notice/src/main/res/drawable-xhdpi/module_push_message_background.9.png similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable-xhdpi/module_push_message_background.9.png rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable-xhdpi/module_push_message_background.9.png diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_clear_bg.xml b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_clear_bg.xml similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable/module_push_clear_bg.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_clear_bg.xml diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_close.png b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_close.png similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable/module_push_close.png rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_close.png diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_content_background.xml b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_content_background.xml similarity index 85% rename from modules/mogo-module-push/src/main/res/drawable/module_push_content_background.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_content_background.xml index 5e39ae0d22..8091d466be 100644 --- a/modules/mogo-module-push/src/main/res/drawable/module_push_content_background.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_content_background.xml @@ -2,5 +2,5 @@ - + diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_decrease_timer_bkg.xml b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_decrease_timer_bkg.xml similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable/module_push_decrease_timer_bkg.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_decrease_timer_bkg.xml diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_dialog_check_background.xml b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_dialog_check_background.xml similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable/module_push_dialog_check_background.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_dialog_check_background.xml diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_item_background.xml similarity index 82% rename from modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_item_background.xml index 2a98ae4301..a70936cd5d 100644 --- a/modules/mogo-module-push/src/main/res/drawable/module_push_item_background.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_item_background.xml @@ -3,8 +3,8 @@ android:shape="rectangle"> diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_item_background_origin.xml b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_item_background_origin.xml similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable/module_push_item_background_origin.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_item_background_origin.xml diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_left_button.xml b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_left_button.xml similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable/module_push_left_button.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_left_button.xml diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_message_background.9.png similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable/module_push_message_background.9.png rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_message_background.9.png diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_recycler_item_background.xml b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_recycler_item_background.xml similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable/module_push_recycler_item_background.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_recycler_item_background.xml diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_right_button.xml b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_right_button.xml similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable/module_push_right_button.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_right_button.xml diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_ui_delay_background.xml b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_ui_delay_background.xml similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable/module_push_ui_delay_background.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_ui_delay_background.xml diff --git a/modules/mogo-module-push/src/main/res/drawable/module_push_ui_ic_message2.png b/core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_ui_ic_message2.png similarity index 100% rename from modules/mogo-module-push/src/main/res/drawable/module_push_ui_ic_message2.png rename to core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_ui_ic_message2.png diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_dialog_check.xml b/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_dialog_check.xml similarity index 96% rename from modules/mogo-module-push/src/main/res/layout/module_push_dialog_check.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_dialog_check.xml index 7fdd8003f5..8b13014fe8 100644 --- a/modules/mogo-module-push/src/main/res/layout/module_push_dialog_check.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_dialog_check.xml @@ -25,8 +25,6 @@ android:layout_marginTop="@dimen/module_push_dialog_title_margin" android:textColor="@android:color/white" android:textSize="@dimen/module_push_dialog_title_size" - android:text="官方公告" - android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/modules/mogo-module-push/src/main/res/layout/module_push_item.xml b/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_item.xml similarity index 81% rename from modules/mogo-module-push/src/main/res/layout/module_push_item.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_item.xml index 4cb87856d8..f6375db0f6 100644 --- a/modules/mogo-module-push/src/main/res/layout/module_push_item.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_item.xml @@ -25,8 +25,6 @@ android:layout_marginLeft="@dimen/module_push_ui_app_icon_leftMargin" android:layout_marginTop="@dimen/module_push_ui_app_icon_topMargin" android:gravity="center_vertical" - android:orientation="vertical" - app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@+id/module_push_image" app:layout_constraintTop_toTopOf="parent" app:layout_goneMarginTop="@dimen/module_push_ui_app_icon_goneTopMargin"> @@ -44,29 +42,36 @@ android:textSize="@dimen/module_push_ui_title_textSize" app:layout_constrainedWidth="true" tools:text="官方公告" /> + + + - + - 8px 12px 16px - 6px 19px 30px 16px diff --git a/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml b/core/function-impl/mogo-core-function-notice/src/main/res/values-mdpi/dimens.xml similarity index 98% rename from modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/values-mdpi/dimens.xml index 6a741d060b..1f1106b6c5 100644 --- a/modules/mogo-module-push/src/main/res/values-ldpi/dimens.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/values-mdpi/dimens.xml @@ -58,7 +58,6 @@ 8px 12px 16px - 6px 19px 30px 16px diff --git a/modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml b/core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi-2560x1440/dimens.xml similarity index 94% rename from modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi-2560x1440/dimens.xml index d3d0959788..4afc379245 100644 --- a/modules/mogo-module-push/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -7,7 +7,6 @@ 30px 21px 34px - 20px 33px 2px 120px @@ -18,7 +17,7 @@ 394px 42px 567px - 120px + 100px 20px 34px 34px diff --git a/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi/dimens.xml similarity index 98% rename from modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi/dimens.xml index 7f784d0108..c7e71bf8e5 100644 --- a/modules/mogo-module-push/src/main/res/values-xhdpi/dimens.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi/dimens.xml @@ -58,7 +58,6 @@ 17px 21px 30px - 20px 33px 50px 30px diff --git a/modules/mogo-module-push/src/main/res/values/attr.xml b/core/function-impl/mogo-core-function-notice/src/main/res/values/attr.xml similarity index 97% rename from modules/mogo-module-push/src/main/res/values/attr.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/values/attr.xml index 8972302147..ca8014fc39 100644 --- a/modules/mogo-module-push/src/main/res/values/attr.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/values/attr.xml @@ -1,30 +1,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-push/src/main/res/values/colors.xml b/core/function-impl/mogo-core-function-notice/src/main/res/values/colors.xml similarity index 87% rename from modules/mogo-module-push/src/main/res/values/colors.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/values/colors.xml index 6ec6f21c42..d01c09cbad 100644 --- a/modules/mogo-module-push/src/main/res/values/colors.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/values/colors.xml @@ -4,7 +4,7 @@ #FFFFFF #B2FFFFFF #999999 - #FFF + #B3FFFFFF #5A8EFD #E63B4577 \ No newline at end of file diff --git a/modules/mogo-module-push/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-notice/src/main/res/values/dimens.xml similarity index 98% rename from modules/mogo-module-push/src/main/res/values/dimens.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/values/dimens.xml index 5738bb1b5f..dc5f0d6635 100644 --- a/modules/mogo-module-push/src/main/res/values/dimens.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/res/values/dimens.xml @@ -58,7 +58,6 @@ 8px 12px 16px - 6px 19px 30px 16px @@ -103,7 +102,7 @@ 34px 567px - 120px + 100px 2px 120px diff --git a/modules/mogo-module-push/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-notice/src/main/res/values/strings.xml similarity index 100% rename from modules/mogo-module-push/src/main/res/values/strings.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/values/strings.xml diff --git a/modules/mogo-module-push/src/main/res/values/styles.xml b/core/function-impl/mogo-core-function-notice/src/main/res/values/styles.xml similarity index 100% rename from modules/mogo-module-push/src/main/res/values/styles.xml rename to core/function-impl/mogo-core-function-notice/src/main/res/values/styles.xml