[Update]把公告业务逻辑挪到core/notice模块

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;

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')
     }
 }
 

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  //注册长连接类型

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

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;
 

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
+}

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
 

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 {

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() {

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;
 

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;
 

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;
 

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(

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;

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

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
 

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

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

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

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

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,

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

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) {
 

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;

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;

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;

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;

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 {

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) {
 

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,

core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_content_background.xml

@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="@dimen/module_push_content_only_line_space" />
-    <solid android:color=" #222533" />
+    <solid android:color="#222533" />
 </shape>

core/function-impl/mogo-core-function-notice/src/main/res/drawable/module_push_item_background.xml

@@ -3,8 +3,8 @@
     android:shape="rectangle">
     <gradient
         android:angle="135"
-        android:endColor="#80000000"
-        android:startColor="#80000000"
+        android:endColor="#33000000"
+        android:startColor="#33000000"
         android:type="linear" />
     <corners android:radius="@dimen/module_push_ui_bkg_corner" />
 </shape>

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" />

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="官方公告" />
+    </LinearLayout>
+
+    <RelativeLayout
+        android:id="@+id/module_push_rl_content"
+        android:layout_width="@dimen/module_push_ui_content_width"
+        android:layout_height="@dimen/module_push_ui_content_height"
+        android:layout_marginTop="@dimen/module_push_ui_content_marginTop"
+        android:layout_marginBottom="@dimen/module_push_ui_content_marginBottom"
+        app:layout_constraintLeft_toLeftOf="@id/module_push_app_icon_title"
+        app:layout_constraintTop_toBottomOf="@id/module_push_app_icon_title">
 
         <TextView
             android:id="@+id/module_push_content"
-            android:layout_width="@dimen/module_push_ui_content_width"
-            android:layout_height="@dimen/module_push_ui_content_height"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
             android:ellipsize="end"
-            android:layout_marginTop="@dimen/module_push_ui_content_topMargin"
-            android:gravity="top|left"
-            android:maxLines="2"
-            android:text="这是测试数据,当前测试数据是为了查看换行的显示效果,如果最多3行呢,怎么显示的呢"
+            android:maxLines="3"
             android:textColor="@android:color/white"
             android:textSize="@dimen/module_push_ui_title_text_size" />
-    </LinearLayout>
 
+    </RelativeLayout>
 
     <View
         android:id="@+id/module_push_line"
         android:layout_width="@dimen/module_push_line_width"
         android:layout_height="@dimen/module_push_line_height"
-        android:layout_marginLeft="@dimen/dp_100"
+        android:layout_marginLeft="@dimen/module_push_line_margin_left"
         android:background="@color/module_push_item_line_color"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toRightOf="@+id/module_push_app_icon_title"
+        app:layout_constraintLeft_toRightOf="@+id/module_push_rl_content"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView

core/function-impl/mogo-core-function-notice/src/main/res/layout/module_push_item_origin.xml

@@ -6,7 +6,7 @@
     android:layout_height="@dimen/module_push_ui_height"
     android:background="@drawable/module_push_item_background_p">
 
-    <com.mogo.module.push.view.roundimage.RoundedImageView
+    <com.mogo.eagle.core.function.notice.view.roundimage.RoundedImageView
         android:id="@+id/module_push_image"
         android:layout_width="@dimen/module_push_ui_image_width"
         android:layout_height="@dimen/module_push_ui_image_height"

core/function-impl/mogo-core-function-notice/src/main/res/values-ldpi/dimens.xml

@@ -58,7 +58,6 @@
     <dimen name="module_push_ui_image_marLeft">8px</dimen>
     <dimen name="module_push_ui_app_icon_leftMargin">12px</dimen>
     <dimen name="module_push_ui_app_icon_topMargin">16px</dimen>
-    <dimen name="module_push_ui_content_topMargin">6px</dimen>
     <dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen>
     <dimen name="module_push_ui_app_icon_size">30px</dimen>
     <dimen name="module_push_ui_title_textSize">16px</dimen>

core/function-impl/mogo-core-function-notice/src/main/res/values-mdpi/dimens.xml

@@ -58,7 +58,6 @@
     <dimen name="module_push_ui_image_marLeft">8px</dimen>
     <dimen name="module_push_ui_app_icon_leftMargin">12px</dimen>
     <dimen name="module_push_ui_app_icon_topMargin">16px</dimen>
-    <dimen name="module_push_ui_content_topMargin">6px</dimen>
     <dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen>
     <dimen name="module_push_ui_app_icon_size">30px</dimen>
     <dimen name="module_push_ui_title_textSize">16px</dimen>

core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi-2560x1440/dimens.xml

@@ -7,7 +7,6 @@
     <dimen name="module_push_ui_image_corner">30px</dimen>
     <dimen name="module_push_ui_app_icon_leftMargin">21px</dimen>
     <dimen name="module_push_ui_app_icon_topMargin">34px</dimen>
-    <dimen name="module_push_ui_content_topMargin">20px</dimen>
     <dimen name="module_push_ui_app_icon_goneTopMargin">33px</dimen>
     <dimen name="module_push_line_width">2px</dimen>
     <dimen name="module_push_line_height">120px</dimen>
@@ -18,7 +17,7 @@
     <dimen name="module_push_title_mix_width">394px</dimen>
     <dimen name="module_push_ui_title_textSize">42px</dimen>
     <dimen name="module_push_ui_content_width">567px</dimen>
-    <dimen name="module_push_ui_content_height">120px</dimen>
+    <dimen name="module_push_ui_content_height">100px</dimen>
     <dimen name="module_push_ui_content_marginTop">20px</dimen>
     <dimen name="module_push_ui_content_marginBottom">34px</dimen>
     <dimen name="module_push_ui_title_text_size">34px</dimen>

core/function-impl/mogo-core-function-notice/src/main/res/values-xhdpi/dimens.xml

@@ -58,7 +58,6 @@
     <dimen name="module_push_ui_image_marLeft">17px</dimen>
     <dimen name="module_push_ui_app_icon_leftMargin">21px</dimen>
     <dimen name="module_push_ui_app_icon_topMargin">30px</dimen>
-    <dimen name="module_push_ui_content_topMargin">20px</dimen>
     <dimen name="module_push_ui_app_icon_goneTopMargin">33px</dimen>
     <dimen name="module_push_ui_app_icon_size">50px</dimen>
     <dimen name="module_push_ui_title_textSize">30px</dimen>

core/function-impl/mogo-core-function-notice/src/main/res/values/attr.xml

@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <declare-styleable name="RoundedImageView">
-        <attr name="riv_corner_radius" format="dimension" />
-        <attr name="riv_corner_radius_top_left" format="dimension" />
-        <attr name="riv_corner_radius_top_right" format="dimension" />
-        <attr name="riv_corner_radius_bottom_left" format="dimension" />
-        <attr name="riv_corner_radius_bottom_right" format="dimension" />
-        <attr name="riv_border_width" format="dimension" />
-        <attr name="riv_border_color" format="color" />
-        <attr name="riv_mutate_background" format="boolean" />
-        <attr name="riv_oval" format="boolean" />
-        <attr name="android:scaleType" />
-        <attr name="riv_tile_Mode">
-            <enum name="clamp" value="0" />
-            <enum name="repeat" value="1" />
-            <enum name="mirror" value="2" />
-        </attr>
-        <attr name="riv_tile_Mode_x">
-            <enum name="clamp" value="0" />
-            <enum name="repeat" value="1" />
-            <enum name="mirror" value="2" />
-        </attr>
-        <attr name="riv_tile_Mode_y">
-            <enum name="clamp" value="0" />
-            <enum name="repeat" value="1" />
-            <enum name="mirror" value="2" />
-        </attr>
-    </declare-styleable>
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="RoundedImageView">
+        <attr name="riv_corner_radius" format="dimension" />
+        <attr name="riv_corner_radius_top_left" format="dimension" />
+        <attr name="riv_corner_radius_top_right" format="dimension" />
+        <attr name="riv_corner_radius_bottom_left" format="dimension" />
+        <attr name="riv_corner_radius_bottom_right" format="dimension" />
+        <attr name="riv_border_width" format="dimension" />
+        <attr name="riv_border_color" format="color" />
+        <attr name="riv_mutate_background" format="boolean" />
+        <attr name="riv_oval" format="boolean" />
+        <attr name="android:scaleType" />
+        <attr name="riv_tile_Mode">
+            <enum name="clamp" value="0" />
+            <enum name="repeat" value="1" />
+            <enum name="mirror" value="2" />
+        </attr>
+        <attr name="riv_tile_Mode_x">
+            <enum name="clamp" value="0" />
+            <enum name="repeat" value="1" />
+            <enum name="mirror" value="2" />
+        </attr>
+        <attr name="riv_tile_Mode_y">
+            <enum name="clamp" value="0" />
+            <enum name="repeat" value="1" />
+            <enum name="mirror" value="2" />
+        </attr>
+    </declare-styleable>
 </resources>

core/function-impl/mogo-core-function-notice/src/main/res/values/colors.xml

@@ -4,7 +4,7 @@
     <color name="module_push_item_title_textColor">#FFFFFF</color>
     <color name="module_push_item_content_textColor">#B2FFFFFF</color>
     <color name="module_push_item_time_textColor">#999999</color>
-    <color name="module_push_item_line_color">#FFF</color>
+    <color name="module_push_item_line_color">#B3FFFFFF</color>
     <color name="module_push_check_color">#5A8EFD</color>
     <color name="module_push_check_dialog_bg_color">#E63B4577</color>
 </resources>

core/function-impl/mogo-core-function-notice/src/main/res/values/dimens.xml

@@ -58,7 +58,6 @@
     <dimen name="module_push_ui_image_marLeft">8px</dimen>
     <dimen name="module_push_ui_app_icon_leftMargin">12px</dimen>
     <dimen name="module_push_ui_app_icon_topMargin">16px</dimen>
-    <dimen name="module_push_ui_content_topMargin">6px</dimen>
     <dimen name="module_push_ui_app_icon_goneTopMargin">19px</dimen>
     <dimen name="module_push_ui_app_icon_size">30px</dimen>
     <dimen name="module_push_ui_title_textSize">16px</dimen>
@@ -103,7 +102,7 @@
 
     <dimen name="module_push_ui_content_marginBottom">34px</dimen>
     <dimen name="module_push_ui_content_width">567px</dimen>
-    <dimen name="module_push_ui_content_height">120px</dimen>
+    <dimen name="module_push_ui_content_height">100px</dimen>
 
     <dimen name="module_push_line_width">2px</dimen>
     <dimen name="module_push_line_height">120px</dimen>