封装展现模块，将DataFetcher抽到上层

@@ -61,6 +61,7 @@ dependencies {
     implementation rootProject.ext.dependencies["material"]
     implementation project(':lib_base')
     implementation project(path: ':wdinterfaceimpl')
+    implementation project(path: ':wdlayoutdataimpl')
     implementation project(path: ':module_home')
     implementation project(path: ':module_videoplayer')
     implementation project(path: ':module_personalcenter')

@@ -8,7 +8,6 @@ import android.os.Bundle;
 import androidx.annotation.Nullable;
 
 import com.wd.common.utils.ProcessUtils;
-import com.wd.module_home.AppMainActivity;
 
 public class MainActivity extends Activity {
 

@@ -4,7 +4,7 @@ package com.wd.fastcoding.app;
 import com.hjq.toast.Toaster;
 import com.wd.capability.network.RetrofitClient;
 import com.wd.capability.router.ArouteInit;
-import com.wd.common.base.BaseApplication;
+import com.wd.foundation.wdkit.base.BaseApplication;
 import com.wd.fastcoding.app.start.StartTaskConfig;
 import com.wd.foundation.wdkit.utils.CommonUtil;
 import com.wd.foundation.wdkitcore.tools.AppContext;

@@ -38,6 +38,7 @@ dependencies {
     api rootProject.ext.dependencies["gson"]
 //    implementation project(path: ':base_umeng')
     implementation project(path: ':base_speech')
+    implementation project(path: ':wdlayout')
     api project(path: ':lib_base')
     implementation project(':aar_repo:lib_speech')
     implementation rootProject.ext.dependencies["eventbus"]

@@ -15,8 +15,8 @@ import com.people.comment.view_holder.CommentTitleViewHolder;
 import com.people.comment.view_holder.EmptyCommentViewHolder;
 import com.people.comment.view_holder.MoreCommentViewHolder;
 import com.people.comment.view_holder.NoMoreCommentViewHolder;
-import com.wd.common.constant.PageNameConstants;
-import com.wd.common.widget.DefaultView;
+import com.wd.foundation.wdkit.constant.PageNameConstants;
+import com.wd.foundation.wdkit.view.DefaultView;
 import com.wd.foundation.bean.custom.content.CommentItem;
 import com.wd.foundation.wdkitcore.tools.ResUtils;
 

@@ -9,7 +9,7 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 
 import com.people.comment.R;
-import com.wd.common.imageglide.ImageUtils;
+import com.wd.foundation.wdkit.imageglide.ImageUtils;
 import com.wd.foundation.wdkit.utils.ScreenUtils;
 
 import java.util.ArrayList;

@@ -22,9 +22,9 @@ import androidx.core.content.ContextCompat;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.people.comment.R;
 import com.wd.common.base.BaseSplitAdapter;
-import com.wd.common.imageglide.ImageUtils;
-import com.wd.common.viewclick.BaseClickListener;
-import com.wd.common.widget.ExpandableTextView;
+import com.wd.foundation.wdkit.imageglide.ImageUtils;
+import com.wd.foundation.wdkit.viewclick.BaseClickListener;
+import com.wd.foundation.wdkit.view.ExpandableTextView;
 import com.wd.foundation.bean.custom.content.CommentItem;
 import com.wd.foundation.bean.response.ParentCommentVoBean;
 import com.wd.foundation.bean.utils.TimeUtil;

@@ -19,11 +19,10 @@ import androidx.core.content.ContextCompat;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.people.comment.R;
 import com.wd.common.base.BaseSplitAdapter;
-import com.wd.common.imageglide.ImageUtils;
-import com.wd.common.viewclick.BaseClickListener;
-import com.wd.common.widget.ExpandableTextView;
+import com.wd.foundation.wdkit.imageglide.ImageUtils;
+import com.wd.foundation.wdkit.viewclick.BaseClickListener;
+import com.wd.foundation.wdkit.view.ExpandableTextView;
 import com.wd.foundation.bean.custom.content.CommentItem;
-import com.wd.foundation.bean.music.bean.VoicePlayerBean;
 import com.wd.foundation.bean.response.ParentCommentVoBean;
 import com.wd.foundation.wdkit.perloader.DeviceHelper;
 import com.wd.foundation.wdkitcore.tools.AppContext;

@@ -10,7 +10,7 @@ import com.people.comment.listener.MyCommentListDataListener;
 import com.people.comment.listener.SubmitMyCommentListListener;
 import com.wd.capability.network.BaseObserver;
 import com.wd.capability.network.bean.MetaBean;
-import com.wd.capability.network.constant.EventConstants;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.capability.network.constant.ParameterConstant;
 import com.wd.capability.network.fetcher.BaseDataFetcher;
 import com.wd.capability.network.response.BaseResponse;
@@ -19,7 +19,7 @@ import com.wd.common.incentive.constants.TaskOperateTypeConstants;
 import com.wd.common.incentive.task.TaskManager;
 import com.wd.common.interact.ICommentDataNewListener;
 import com.wd.common.utils.CommonNetUtils;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.foundation.bean.comment.CommentListBean;
 import com.wd.foundation.bean.comment.CommentStatusBean;
 import com.wd.foundation.bean.custom.content.CommentItem;

@@ -7,7 +7,7 @@ import com.people.comment.listener.BatchMyCommentListLikeStatusListener;
 import com.people.comment.listener.DeleteMyCommentListListener;
 import com.people.comment.listener.MyCommentListDataListener;
 import com.people.comment.listener.SubmitMyCommentListListener;
-import com.wd.common.UIViewModel;
+import com.wd.foundation.wdkit.mvvm.vm.UIViewModel;
 import com.wd.common.interact.ICommentDataNewListener;
 import com.wd.common.interfaces.OnGetContentBeanSuccessListener;
 import com.wd.common.utils.CommonNetUtils;

@@ -3,7 +3,7 @@ package com.people.comment.comment.vm;
 import androidx.lifecycle.LifecycleOwner;
 import com.people.comment.comment.listener.IVisitorCommentDataListener;
 import com.people.comment.comment.model.VisitorCommentDataFetcher;
-import com.wd.common.UIViewModel;
+import com.wd.foundation.wdkit.mvvm.vm.UIViewModel;
 
 /**
  * 游客评论vm

-package com.wd.capability.layout.ui.commonpage;
+package com.people.comment.commonpage;
 
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 
 
-import com.wd.common.constant.PageNameConstants;
+import com.wd.foundation.wdkit.constant.PageNameConstants;
 import com.wd.foundation.bean.convenience.AskItemBean;
 import com.wd.foundation.bean.custom.act.BaseActivityBean;
 import com.wd.foundation.bean.custom.comp.AudioBean;

-package com.wd.capability.layout.ui.commonpage;
+package com.people.comment.commonpage;
 
 import android.content.Context;
 import android.text.TextUtils;
 
+import com.people.comment.fragment.TemplateFragment;
 import com.people.room.SubscribeLivingHelper;
 import com.people.room.entity.SubscribeLivingModel;
 import com.wd.capability.layout.R;
-import com.wd.capability.layout.fragment.TemplateFragment;
 import com.wd.capability.network.BaseObserver;
 import com.wd.capability.network.constant.ParameterConstant;
 import com.wd.capability.network.response.BaseResponse;
 import com.wd.common.api.RequestApi;
-import com.wd.common.constant.PageNameConstants;
+import com.wd.foundation.wdkit.constant.PageNameConstants;
 import com.wd.common.utils.CommonNetUtils;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.common.utils.WorksDataHelper;
 import com.wd.foundation.bean.RecListBean;
 import com.wd.foundation.bean.analytics.LiveTypeConstants;

-package com.wd.capability.layout.ui.commonpage;
+package com.people.comment.commonpage;
 
 import com.wd.capability.layout.comp.layoutdata.Page;
 import com.wd.foundation.bean.custom.comp.PageBean;

-package com.wd.capability.layout.ui.commonpage;
+package com.people.comment.commonpage;
 
 import android.content.Context;
 

-package com.wd.capability.layout.ui.commonpage;
+package com.people.comment.commonpage;
 
 import com.people.room.entity.ChannelBean;
 import com.wd.capability.layout.comp.layoutdata.AbsGroup;
 import com.wd.capability.layout.comp.layoutdata.Page;
 import com.wd.capability.layout.comp.parser.ChannelSectionParser;
+import com.wd.capability.layout.ui.follow.listener.BatchCallback;
 import com.wd.capability.layout.uitls.CompentLogicUtil;
 import com.wd.capability.network.fetcher.BaseDataFetcher;
 import com.wd.common.api.RequestApi;
 import com.wd.common.fetcher.InteractionStatusDataFetcher;
-import com.wd.common.listener.BatchCallback;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.foundation.bean.comment.DisplayWorkInfoBean;
 import com.wd.foundation.bean.custom.comp.CompBean;
 import com.wd.foundation.bean.custom.comp.GoldenPositionExtraBean;

 package com.people.comment.dialog;
 
 import android.app.Activity;
-import android.content.pm.ActivityInfo;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
@@ -18,10 +17,9 @@ import androidx.core.content.ContextCompat;
 import com.people.comment.R;
 import com.people.comment.listener.CommitDialogListener;
 import com.people.comment.manager.ExpressionManager;
-import com.people.comment.utils.KeyboardHelper;
-import com.wd.common.constant.PageNameConstants;
+import com.wd.foundation.wdkit.constant.PageNameConstants;
 import com.wd.common.dialog.LayerDialog;
-import com.wd.common.imageglide.ImageUtils;
+import com.wd.foundation.wdkit.imageglide.ImageUtils;
 import com.wd.common.permissions.IPmsCallBack;
 import com.wd.common.permissions.PermissionsUtils;
 import com.wd.common.widget.edittext.AutoAdaptTextSize;
@@ -40,7 +38,6 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.ArrayList;
-import java.util.EnumSet;
 import java.util.List;
 
 /**

@@ -26,20 +26,18 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;
 import com.wd.base.log.Logger;
 import com.wd.capability.network.BaseObserver;
-import com.wd.capability.network.constant.EventConstants;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.capability.network.response.ExceptionHandle;
-import com.wd.common.constant.RegionNameConstants;
-import com.wd.common.dialog.AlertDialog;
+import com.wd.foundation.wdkit.dialog.AlertDialog;
 import com.wd.common.enums.MoreEnum;
 import com.wd.common.enums.PosterTypeEnum;
 import com.wd.common.progress.PageLoadingView;
 import com.wd.common.utils.CommonNetUtils;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.common.utils.ProcessUtils;
 import com.wd.common.widget.BottomCommentFunctionBar;
-import com.wd.common.widget.CommomLoadMoreFooter;
-import com.wd.common.widget.CustomSmartRefreshLayout;
-import com.wd.foundation.bean.analytics.TrackContentBean;
+import com.wd.foundation.wdkit.view.CommomLoadMoreFooter;
+import com.wd.foundation.wdkit.view.CustomSmartRefreshLayout;
 import com.wd.foundation.bean.comment.CommentListBean;
 import com.wd.foundation.bean.comment.CommentStatusBean;
 import com.wd.foundation.bean.comment.TransparentBean;

@@ -29,7 +29,7 @@ import com.people.comment.bean.EmojiEntity;
 import com.people.comment.listener.CommentSeedListener;
 import com.wd.capability.network.BaseObserver;
 import com.wd.capability.network.bean.MetaBean;
-import com.wd.capability.network.constant.EventConstants;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.common.listener.SimpleTextWatcher;
 import com.wd.common.utils.CommonNetUtils;
 import com.wd.common.widget.InnerGridView;

@@ -18,21 +18,20 @@ import com.people.comment.dialog.CommentCommitDialog;
 import com.people.comment.listener.CommitDialogListener;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;
-import com.wd.capability.network.constant.EventConstants;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.capability.network.response.ExceptionHandle;
 import com.wd.common.base.BaseActivity;
-import com.wd.common.base.BaseLazyFragment;
-import com.wd.common.dialog.AlertDialog;
+import com.wd.foundation.wdkit.base.fragment.BaseLazyFragment;
+import com.wd.foundation.wdkit.dialog.AlertDialog;
 import com.wd.common.enums.MoreEnum;
 import com.wd.common.enums.PosterTypeEnum;
 import com.wd.common.interact.ICommentDataNewListener;
 import com.wd.common.manager.WrapContentLinearLayoutManager;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.common.utils.ProcessUtils;
-import com.wd.common.widget.CommomLoadMoreFooter;
-import com.wd.common.widget.CustomSmartRefreshLayout;
+import com.wd.foundation.wdkit.view.CommomLoadMoreFooter;
+import com.wd.foundation.wdkit.view.CustomSmartRefreshLayout;
 import com.wd.foundation.bean.analytics.TraceBean;
-import com.wd.foundation.bean.analytics.TrackContentBean;
 import com.wd.foundation.bean.comment.CommentListBean;
 import com.wd.foundation.bean.comment.CommentStatusBean;
 import com.wd.foundation.bean.comment.TransparentBean;

-package com.wd.capability.layout.fragment;
+package com.people.comment.fragment;
 
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -18,15 +18,18 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
 
+import com.people.comment.R;
 import com.people.comment.bean.CommentClickShowType;
 import com.people.comment.comment.vm.CommentViewModel;
+import com.people.comment.commonpage.TemplatePageDataFetcher;
+import com.people.comment.commonpage.TemplatePageDataListener;
+import com.people.comment.commonpage.TemplatePageDataViewModel;
 import com.people.comment.dialog.CommentCommitDialog;
 import com.people.comment.listener.CommitDialogListener;
 import com.people.room.entity.ChannelBean;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 import com.wd.base.log.Logger;
-import com.wd.capability.layout.R;
 import com.wd.capability.layout.comp.layoutdata.AbsGroup;
 import com.wd.capability.layout.comp.layoutdata.AbsSection;
 import com.wd.capability.layout.comp.layoutdata.Group;
@@ -38,30 +41,27 @@ import com.wd.capability.layout.comp.layoutmanager.LayoutAdapter;
 import com.wd.capability.layout.comp.layoutmanager.channel.CompBeSimilarMore;
 import com.wd.capability.layout.comp.layoutmanager.channel.CompLabel01;
 import com.wd.capability.layout.comp.layoutmanager.channel.CompSingleMessageBoard;
-import com.wd.capability.layout.ui.commonpage.TemplatePageDataFetcher;
-import com.wd.capability.layout.ui.commonpage.TemplatePageDataListener;
-import com.wd.capability.layout.ui.commonpage.TemplatePageDataViewModel;
 import com.wd.capability.layout.ui.widget.ColumnRecyclerView;
-import com.wd.capability.layout.ui.widget.VerticalLoadScrollListener;
 import com.wd.capability.layout.ui.widget.itemhelp.ItemStateChangeListener;
-import com.wd.capability.layout.ui.widget.progress.PageLoadingView;
 import com.wd.capability.layout.uitls.CompentLogicUtil;
-import com.wd.capability.network.BaseObserver;
-import com.wd.capability.network.bean.MetaBean;
-import com.wd.capability.network.constant.EventConstants;
-import com.wd.capability.network.utils.NetworkUtil;
-import com.wd.common.base.BaseAutoLazyFragment;
-import com.wd.common.decoration.Decoration;
+import com.wd.foundation.wdkit.dialog.AlertDialog;
 import com.wd.common.enums.MoreEnum;
 import com.wd.common.interact.ICommentDataNewListener;
+import com.wd.common.interfaces.VerticalLoadScrollListener;
 import com.wd.common.utils.CommonNetUtils;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.common.utils.ProcessUtils;
-import com.wd.common.widget.CommomLoadMoreFooter;
-import com.wd.common.widget.CommonRefreshHeader;
-import com.wd.common.widget.CustomSmartRefreshLayout;
-import com.wd.common.widget.DefaultView;
-import com.wd.foundation.bean.analytics.TrackContentBean;
+import com.wd.foundation.wdkit.base.fragment.BaseAutoLazyFragment;
+import com.wd.foundation.wdkit.decoration.Decoration;
+import com.wd.foundation.wdkit.view.CommomLoadMoreFooter;
+import com.wd.foundation.wdkit.view.CommonRefreshHeader;
+import com.wd.foundation.wdkit.view.CustomSmartRefreshLayout;
+import com.wd.foundation.wdkit.view.PageLoadingView;
+import com.wd.capability.network.BaseObserver;
+import com.wd.capability.network.bean.MetaBean;
+import com.wd.foundation.wdkit.constant.EventConstants;
+import com.wd.capability.network.utils.NetworkUtil;
+import com.wd.foundation.wdkit.view.DefaultView;
 import com.wd.foundation.bean.comment.CommentListBean;
 import com.wd.foundation.bean.comment.CommentStatusBean;
 import com.wd.foundation.bean.comment.TransparentBean;
@@ -92,7 +92,6 @@ import com.wd.foundation.wdkitcore.tools.ResUtils;
 import com.wd.foundation.wdkitcore.tools.StringUtils;
 
 import org.jetbrains.annotations.NotNull;
-import com.wd.common.dialog.AlertDialog;
 
 import java.util.ArrayList;
 import java.util.List;

@@ -11,7 +11,7 @@ import com.people.comment.listener.CommentClickListener;
 import com.people.comment.view.easy_pop.EasyPopup;
 import com.people.comment.view.easy_pop.XGravity;
 import com.people.comment.view.easy_pop.YGravity;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.common.utils.ProcessUtils;
 import com.wd.foundation.wdkitcore.tools.AppContext;
 

@@ -18,11 +18,11 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.people.comment.R;
 import com.people.comment.adapter.CommentListAdapter;
-import com.wd.common.imageglide.ImageUtils;
-import com.wd.common.utils.FontSettingUtil;
+import com.wd.foundation.wdkit.imageglide.ImageUtils;
+import com.wd.foundation.wdkit.utils.FontSettingUtil;
 import com.wd.common.utils.TimeTools;
-import com.wd.common.viewclick.BaseClickListener;
-import com.wd.common.widget.ExpandableTextView;
+import com.wd.foundation.wdkit.viewclick.BaseClickListener;
+import com.wd.foundation.wdkit.view.ExpandableTextView;
 import com.wd.foundation.bean.custom.content.CommentItem;
 import com.wd.foundation.wdkit.utils.NumberStrUtils;
 import com.wd.foundation.wdkit.utils.SpUtils;

@@ -18,11 +18,11 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.people.comment.R;
 import com.people.comment.adapter.CommentListAdapter;
-import com.wd.common.imageglide.ImageUtils;
-import com.wd.common.utils.FontSettingUtil;
+import com.wd.foundation.wdkit.imageglide.ImageUtils;
+import com.wd.foundation.wdkit.utils.FontSettingUtil;
 import com.wd.common.utils.TimeTools;
-import com.wd.common.viewclick.BaseClickListener;
-import com.wd.common.widget.ExpandableTextView;
+import com.wd.foundation.wdkit.viewclick.BaseClickListener;
+import com.wd.foundation.wdkit.view.ExpandableTextView;
 import com.wd.foundation.bean.custom.content.CommentItem;
 import com.wd.foundation.wdkit.utils.FilletUtil;
 import com.wd.foundation.wdkit.utils.NumberStrUtils;

@@ -5,7 +5,7 @@ import android.view.View;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.people.comment.R;
-import com.wd.common.widget.DefaultView;
+import com.wd.foundation.wdkit.view.DefaultView;
 import com.wd.foundation.wdkit.constant.DefaultViewConstant;
 
 /**

@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.people.comment.R;
 import com.people.comment.adapter.CommentListAdapter;
-import com.wd.common.viewclick.BaseClickListener;
+import com.wd.foundation.wdkit.viewclick.BaseClickListener;
 
 /**
  * @author ouyang

@@ -65,7 +65,7 @@
         android:layout_weight="1"
         android:background="@color/res_color_common_C8">
 
-        <com.wd.common.widget.CustomSmartRefreshLayout
+        <com.wd.foundation.wdkit.view.CustomSmartRefreshLayout
             android:id="@+id/data_SFL"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -77,7 +77,7 @@
                 android:layout_height="match_parent"
                 android:scrollbars="none" />
 
-        </com.wd.common.widget.CustomSmartRefreshLayout>
+        </com.wd.foundation.wdkit.view.CustomSmartRefreshLayout>
 
         <com.wd.common.progress.PageLoadingView
             android:id="@+id/loading_view"

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <com.wd.common.widget.CustomSmartRefreshLayout
+    <com.wd.foundation.wdkit.view.CustomSmartRefreshLayout
         android:id="@+id/layout_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -19,6 +19,6 @@
             android:background="@color/res_color_common_C8"
             android:overScrollMode="never"/>
 
-    </com.wd.common.widget.CustomSmartRefreshLayout>
+    </com.wd.foundation.wdkit.view.CustomSmartRefreshLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

@@ -169,7 +169,7 @@
         android:orientation="vertical">
 
         <!--文字显示-->
-        <com.wd.common.widget.ExpandableTextView
+        <com.wd.foundation.wdkit.view.ExpandableTextView
             android:id="@+id/content_ETV"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/rmrb_dp300">
 
-    <com.wd.common.widget.DefaultView
+    <com.wd.foundation.wdkit.view.DefaultView
         android:id="@+id/defaultview"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

@@ -132,7 +132,7 @@
             android:orientation="vertical">
 
             <!--评论内容-->
-            <com.wd.common.widget.ExpandableTextView
+            <com.wd.foundation.wdkit.view.ExpandableTextView
                 android:id="@+id/content_ETV"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

@@ -117,7 +117,7 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <com.wd.common.widget.ExpandableTextView
+    <com.wd.foundation.wdkit.view.ExpandableTextView
         android:id="@+id/tv_my_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -160,7 +160,7 @@
         android:paddingVertical="@dimen/rmrb_dp8"
         app:layout_constraintTop_toBottomOf="@id/iv_my_comment">
 
-        <com.wd.common.widget.ExpandableTextView
+        <com.wd.foundation.wdkit.view.ExpandableTextView
             android:id="@+id/tv_original_comment_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

@@ -8,7 +8,7 @@
     android:background="@color/res_color_common_C8"
     tools:background="@color/res_color_common_C12">
 
-    <com.wd.common.widget.ExpandableTextView
+    <com.wd.foundation.wdkit.view.ExpandableTextView
         android:id="@+id/tv_my_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -52,7 +52,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/iv_my_comment">
 
-        <com.wd.common.widget.ExpandableTextView
+        <com.wd.foundation.wdkit.view.ExpandableTextView
             android:id="@+id/tv_original_comment_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

@@ -45,14 +45,13 @@ import com.people.basemusic.utils.AdaptScreenUtils;
 import com.people.basemusic.utils.TimeUtils;
 import com.wd.base.log.Logger;
 import com.wd.capability.network.utils.NetworkUtil;
-import com.wd.common.base.BaseApplication;
+import com.wd.foundation.wdkit.base.BaseApplication;
 import com.wd.common.floatingview.FloatWindow;
 import com.wd.common.floatingview.IFloatingView;
 import com.wd.common.utils.ProcessUtils;
-import com.wd.common.viewclick.BaseClickListener;
+import com.wd.foundation.wdkit.viewclick.BaseClickListener;
 import com.wd.common.widget.ForbidDragSeekBar;
 import com.wd.common.widget.MarqueeNormalTextView;
-import com.wd.foundation.bean.analytics.ActionConstants;
 import com.wd.foundation.bean.analytics.TrackContentBean;
 import com.wd.foundation.bean.music.bean.VoicePlayerBean;
 import com.wd.foundation.bean.music.bean.base.BaseAlbumItem;

@@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 
-import com.wd.common.base.BaseApplication;
+import com.wd.foundation.wdkit.base.BaseApplication;
 
 
 /**

@@ -35,7 +35,7 @@ import com.kunminx.architecture.ui.page.DataBindingActivity;
 import com.wd.base.log.Logger;
 import com.wd.capability.router.data.ActionBean;
 import com.wd.capability.router.data.RouterParameter;
-import com.wd.common.base.BaseApplication;
+import com.wd.foundation.wdkit.base.BaseApplication;
 import com.wd.common.floatingview.FloatWindow;
 import com.people.basemusic.response.manager.NetworkStateManager;
 import com.people.basemusic.utils.AdaptScreenUtils;

@@ -29,7 +29,7 @@ import androidx.navigation.NavController;
 import androidx.navigation.fragment.NavHostFragment;
 
 import com.kunminx.architecture.ui.page.DataBindingFragment;
-import com.wd.common.base.BaseApplication;
+import com.wd.foundation.wdkit.base.BaseApplication;
 
 
 /**

@@ -6,7 +6,7 @@ import android.util.DisplayMetrics;
 import android.util.Log;
 
 
-import com.wd.common.base.BaseApplication;
+import com.wd.foundation.wdkit.base.BaseApplication;
 import com.wd.foundation.wdkit.utils.SpUtils;
 
 import java.lang.reflect.Field;

@@ -25,7 +25,7 @@ import androidx.annotation.RequiresPermission;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.drawerlayout.widget.DrawerLayout;
 
-import com.wd.common.base.BaseApplication;
+import com.wd.foundation.wdkit.base.BaseApplication;
 
 import java.lang.reflect.Method;
 

@@ -8,7 +8,7 @@ import android.net.NetworkInfo;
 
 import androidx.annotation.RequiresPermission;
 
-import com.wd.common.base.BaseApplication;
+import com.wd.foundation.wdkit.base.BaseApplication;
 
 /**
  * <pre>

@@ -28,8 +28,8 @@ import com.people.webview.ui.ArticleDetailActivity;
 import com.people.webview.util.WebDataUtils;
 import com.people.webview.util.WebUtils;
 import com.wd.base.log.Logger;
-import com.wd.common.base.BaseApplication;
-import com.wd.common.dialog.AlertDialog;
+import com.wd.foundation.wdkit.base.BaseApplication;
+import com.wd.foundation.wdkit.dialog.AlertDialog;
 import com.wd.common.utils.ProcessUtils;
 import com.wd.foundation.bean.JsAppInnerLinkBean;
 import com.wd.foundation.bean.JsCallAppBean;

@@ -14,7 +14,6 @@ import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.webkit.SslErrorHandler;
 import android.webkit.WebChromeClient;
-import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -28,8 +27,8 @@ import com.wd.capability.network.utils.NetworkUtil;
 import com.wd.capability.router.data.ActionBean;
 import com.wd.common.base.BaseActivity;
 import com.wd.common.constant.RouterConstants;
-import com.wd.common.widget.CustomTitleBar;
-import com.wd.common.widget.DefaultView;
+import com.wd.foundation.wdkit.view.CustomTitleBar;
+import com.wd.foundation.wdkit.view.DefaultView;
 import com.wd.foundation.wdkit.constant.DefaultViewConstant;
 import com.wd.foundation.wdkit.constant.IntentConstants;
 import com.wd.foundation.wdkit.constant.ProtocolConstant;

@@ -42,18 +42,18 @@ import com.people.webview.vm.IArticleDetailDataListener;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 import com.wd.base.log.Logger;
-import com.wd.capability.layout.fragment.RecommendFragment;
-import com.wd.capability.network.constant.EventConstants;
+import com.people.webview.ui.fragment.RecommendFragment;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.capability.network.constant.ParameterConstant;
 import com.wd.capability.network.utils.NetworkUtil;
 import com.wd.capability.router.data.ActionBean;
 import com.wd.common.base.BaseActivity;
-import com.wd.common.constant.PageNameConstants;
+import com.wd.foundation.wdkit.constant.PageNameConstants;
 import com.wd.common.constant.RouterConstants;
-import com.wd.common.dialog.EasterEggsDialog;
-import com.wd.common.dialog.PopUpsUtils;
+import com.wd.foundation.wdkit.dialog.EasterEggsDialog;
+import com.wd.foundation.wdkit.dialog.PopUpsUtils;
 import com.wd.common.floatingview.FloatWindow;
-import com.wd.common.imageglide.ImageUtils;
+import com.wd.foundation.wdkit.imageglide.ImageUtils;
 import com.wd.common.incentive.constants.TaskOperateTypeConstants;
 import com.wd.common.incentive.task.TaskManager;
 import com.wd.common.interact.collect.CollectTools;
@@ -69,12 +69,12 @@ import com.wd.common.net.NetStateChangeReceiver;
 import com.wd.common.utils.CommonVarUtils;
 import com.wd.common.utils.HistoryDataHelper;
 import com.wd.common.utils.MyShareUtils;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.common.utils.ProcessUtils;
 import com.wd.common.utils.ToolsUtil;
 import com.wd.common.utils.WorksDataHelper;
-import com.wd.common.widget.CommonRefreshHeader;
-import com.wd.common.widget.CustomSmartRefreshLayout;
+import com.wd.foundation.wdkit.view.CommonRefreshHeader;
+import com.wd.foundation.wdkit.view.CustomSmartRefreshLayout;
 import com.wd.foundation.bean.JsCallAppBean;
 import com.wd.foundation.bean.JsShareBean;
 import com.wd.foundation.bean.RecListBean;

@@ -41,7 +41,7 @@ import com.people.webview.util.WebUtils;
 import com.people.webview.vm.ArticleDetailViewModel;
 import com.people.webview.vm.IArticleDetailDataListener;
 import com.wd.base.log.Logger;
-import com.wd.capability.network.constant.EventConstants;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.capability.network.utils.NetworkUtil;
 import com.wd.capability.router.data.ActionBean;
 import com.wd.common.base.BaseActivity;
@@ -55,10 +55,10 @@ import com.wd.common.interact.interacts.callback.INewInteractDataListener;
 import com.wd.common.interact.interacts.fetcher.InteractDataFetcher;
 import com.wd.common.utils.H5JsApiPermissionUtil;
 import com.wd.common.utils.HistoryDataHelper;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.common.utils.ProcessUtils;
 import com.wd.common.widget.BottomCommentFunctionBar;
-import com.wd.common.widget.DefaultView;
+import com.wd.foundation.wdkit.view.DefaultView;
 import com.wd.common.widget.MarqueeNormalTextView;
 import com.wd.foundation.bean.JsCallAppBean;
 import com.wd.foundation.bean.JsImageBean;

@@ -16,7 +16,7 @@ import com.aliyun.player.source.UrlSource;
 import com.people.webview.R;
 import com.people.webview.listener.ChangeScreenListener;
 import com.people.webview.listener.ArticleVideoListener;
-import com.wd.common.base.BaseFragment;
+import com.wd.foundation.wdkit.base.fragment.BaseFragment;
 import com.wd.foundation.bean.web.ArticleVideoBean;
 import com.wd.foundation.wdkit.constant.IntentConstants;
 import com.wd.foundation.wdkit.system.DeviceUtil;

@@ -43,7 +43,7 @@ import com.people.webview.util.WebUtils;
 import com.people.webview.vm.ArticleDetailViewModel;
 import com.people.webview.vm.IArticleDetailDataListener;
 import com.wd.base.log.Logger;
-import com.wd.capability.network.constant.EventConstants;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.capability.network.utils.NetworkUtil;
 import com.wd.capability.router.data.ActionBean;
 import com.wd.common.base.BaseActivity;
@@ -53,7 +53,7 @@ import com.wd.common.permissions.IPmsCallBack;
 import com.wd.common.permissions.PermissionsUtils;
 import com.wd.common.utils.H5JsApiPermissionUtil;
 import com.wd.common.utils.ProcessUtils;
-import com.wd.common.widget.DefaultView;
+import com.wd.foundation.wdkit.view.DefaultView;
 import com.wd.common.widget.MarqueeNormalTextView;
 import com.wd.foundation.bean.JsCallAppBean;
 import com.wd.foundation.bean.JsImageBean;

@@ -48,27 +48,27 @@ import com.people.webview.vm.IArticleDetailDataListener;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 import com.wd.base.log.Logger;
-import com.wd.capability.network.constant.EventConstants;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.capability.network.utils.NetworkUtil;
 import com.wd.capability.router.data.ActionBean;
-import com.wd.common.adv.CornerAdvLogic;
+import com.wd.foundation.wdkit.adv.CornerAdvLogic;
 import com.wd.common.base.BaseActivity;
-import com.wd.common.constant.PageNameConstants;
+import com.wd.foundation.wdkit.constant.PageNameConstants;
 import com.wd.common.constant.RouterConstants;
-import com.wd.common.dialog.EasterEggsDialog;
-import com.wd.common.dialog.PopUpsUtils;
+import com.wd.foundation.wdkit.dialog.EasterEggsDialog;
+import com.wd.foundation.wdkit.dialog.PopUpsUtils;
 import com.wd.common.enums.PosterTypeEnum;
 import com.wd.common.interact.ICommentDataNewListener;
 import com.wd.common.listener.AddFavoriteLabelCallback;
 import com.wd.common.net.NetStateChangeReceiver;
 import com.wd.common.utils.H5JsApiPermissionUtil;
 import com.wd.common.utils.HistoryDataHelper;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.common.utils.ProcessUtils;
 import com.wd.common.widget.BottomCommentFunctionBar;
-import com.wd.common.widget.CommonRefreshHeader;
-import com.wd.common.widget.CustomSmartRefreshLayout;
-import com.wd.common.widget.DefaultView;
+import com.wd.foundation.wdkit.view.CommonRefreshHeader;
+import com.wd.foundation.wdkit.view.CustomSmartRefreshLayout;
+import com.wd.foundation.wdkit.view.DefaultView;
 import com.wd.foundation.bean.JsCallAppBean;
 import com.wd.foundation.bean.JsImageBean;
 import com.wd.foundation.bean.JsScrollBean;

@@ -21,7 +21,7 @@ import androidx.annotation.Nullable;
 import com.google.gson.Gson;
 import com.people.webview.javabridge.BridgeJavascriptInterface;
 import com.wd.base.log.Logger;
-import com.wd.common.base.BaseApplication;
+import com.wd.foundation.wdkit.base.BaseApplication;
 import com.wd.foundation.wdkit.system.DeviceUtil;
 import com.wd.foundation.wdkit.utils.SpUtils;
 import com.wd.foundation.wdkitcore.tools.AppContext;

-package com.wd.capability.layout.fragment;
+package com.people.webview.ui.fragment;
 
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -14,27 +14,27 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
 
+import com.people.comment.commonpage.TemplatePageDataFetcher;
+import com.people.comment.commonpage.TemplatePageDataListener;
+import com.people.comment.commonpage.TemplatePageDataViewModel;
 import com.wd.capability.layout.R;
 import com.wd.capability.layout.comp.layoutdata.Page;
 import com.wd.capability.layout.comp.layoutmanager.BaseAdapter;
 import com.wd.capability.layout.comp.layoutmanager.ILayoutRender;
 import com.wd.capability.layout.comp.layoutmanager.ItemLayoutManager;
 import com.wd.capability.layout.comp.layoutmanager.LayoutAdapter;
-import com.wd.capability.layout.ui.commonpage.TemplatePageDataFetcher;
-import com.wd.capability.layout.ui.commonpage.TemplatePageDataListener;
-import com.wd.capability.layout.ui.commonpage.TemplatePageDataViewModel;
 import com.wd.capability.layout.ui.widget.ColumnRecyclerView;
 import com.wd.capability.layout.ui.widget.itemhelp.ItemStateChangeListener;
 import com.wd.capability.layout.uitls.CompentLogicUtil;
-import com.wd.capability.network.constant.EventConstants;
-import com.wd.common.base.BaseLazyFragment;
-import com.wd.common.decoration.Decoration;
+import com.wd.foundation.wdkit.base.fragment.BaseLazyFragment;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.foundation.bean.RecListBean;
 import com.wd.foundation.bean.custom.MenuBean;
 import com.wd.foundation.bean.custom.comp.CompDataSourceBean;
 import com.wd.foundation.bean.custom.comp.PageBean;
 import com.wd.foundation.bean.livedate.EventMessage;
 import com.wd.foundation.wdkit.constant.IntentConstants;
+import com.wd.foundation.wdkit.decoration.Decoration;
 import com.wd.foundation.wdkit.utils.SafeBundleUtil;
 import com.wd.foundation.wdkitcore.livedata.LiveDataBus;
 import com.wd.foundation.wdkitcore.tools.StringUtils;

 package com.people.webview.util;
 
-import com.wd.common.constant.PageNameConstants;
+import com.wd.foundation.wdkit.constant.PageNameConstants;
 import com.wd.foundation.bean.analytics.TraceBean;
 import com.wd.foundation.bean.analytics.TrackContentBean;
 import com.wd.foundation.bean.custom.content.ContentTypeConstant;

@@ -28,7 +28,7 @@ import com.wd.common.permissions.IPmsCallBack;
 import com.wd.common.permissions.PermissionsUtils;
 import com.wd.common.utils.CommonNetUtils;
 import com.wd.common.utils.ImageDownloadThread;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.common.utils.ProcessUtils;
 import com.wd.foundation.bean.JsCallAppBean;
 import com.wd.foundation.bean.JsImageBean;

 
 package com.people.webview.vm;
 
-import com.wd.common.UIViewModel;
+import com.wd.foundation.wdkit.mvvm.vm.UIViewModel;
 import com.people.webview.model.ArticleDetailFetcher;
 import org.json.JSONObject;
 import androidx.lifecycle.LifecycleOwner;

@@ -31,7 +31,7 @@
             android:background="@color/res_color_common_C7"/>
 
         <!--缺省页面-->
-        <com.wd.common.widget.DefaultView
+        <com.wd.foundation.wdkit.view.DefaultView
             android:id="@+id/default_view"
             android:layout_width="match_parent"
             android:layout_height="0dp"

@@ -6,7 +6,7 @@
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <com.wd.common.widget.CustomTitleBar
+    <com.wd.foundation.wdkit.view.CustomTitleBar
         android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
         android:layout_height="match_parent" />
 
     <!--缺省页面-->
-    <com.wd.common.widget.DefaultView
+    <com.wd.foundation.wdkit.view.DefaultView
         android:id="@+id/default_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <com.wd.common.widget.CustomSmartRefreshLayout
+    <com.wd.foundation.wdkit.view.CustomSmartRefreshLayout
         android:id="@+id/layout_refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -28,7 +28,7 @@
                 android:visibility="visible">
 
                 <!--缺省页面-->
-                <com.wd.common.widget.DefaultView
+                <com.wd.foundation.wdkit.view.DefaultView
                     android:id="@+id/default_view"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
@@ -66,6 +66,6 @@
 
         </LinearLayout>
 
-    </com.wd.common.widget.CustomSmartRefreshLayout>
+    </com.wd.foundation.wdkit.view.CustomSmartRefreshLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

@@ -62,7 +62,7 @@
         app:layout_constraintTop_toBottomOf="@+id/rl_title"
         app:layout_constraintVertical_weight="1">
 
-        <com.wd.common.widget.CustomSmartRefreshLayout
+        <com.wd.foundation.wdkit.view.CustomSmartRefreshLayout
             android:id="@+id/layout_refresh"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -205,7 +205,7 @@
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
             </androidx.core.widget.NestedScrollView>
-        </com.wd.common.widget.CustomSmartRefreshLayout>
+        </com.wd.foundation.wdkit.view.CustomSmartRefreshLayout>
     </LinearLayout>
 
     <View

@@ -66,7 +66,7 @@
     </LinearLayout>
 
     <!--缺省页面-->
-    <com.wd.common.widget.DefaultView
+    <com.wd.foundation.wdkit.view.DefaultView
         android:id="@+id/default_view"
         android:layout_width="match_parent"
         android:layout_height="0dp"

@@ -36,12 +36,12 @@ android {
 }
 
 dependencies {
-    api fileTree(include: ['commons-lang3-3.0.jar'], dir: 'src/main/commonlibs')
     // 快马基础库
     api project(path: ':wdrouter')
     api project(path: ':wdlog')
     api project(path: ':wdkit')
     api project(path: ':wdnetwork')
+    api project(path: ':wdlayout')
     api project(path: ':lib_room')
     // 基础依赖库
     api 'com.alibaba:arouter-api:1.5.2'
@@ -64,7 +64,6 @@ dependencies {
     // RecyclerView多功能适配器
     api rootProject.ext.dependencies["BaseRecyclerViewAdapterHelper"]
 
-    implementation rootProject.ext.dependencies["palette"]
     // 给布局设置阴影
     api rootProject.ext.dependencies["ShapeView"]
     api rootProject.ext.dependencies["ShapeDrawable"]

@@ -27,16 +27,17 @@ import com.wd.base.log.Logger;
 import com.wd.capability.network.constant.NetConstant;
 import com.wd.capability.router.data.ActionBean;
 import com.wd.capability.router.data.RouterParameter;
-import com.wd.capability.network.constant.EventConstants;
-import com.wd.common.dialog.DialogUtils;
+import com.wd.foundation.wdkit.constant.EventConstants;
+import com.wd.foundation.wdkit.utils.DialogUtils;
 import com.wd.common.dialog.FlowTooBigDialog;
 import com.wd.common.permissions.IPmsCallBack;
 import com.wd.common.permissions.PermissionsUtils;
 import com.wd.common.utils.NotificationUtils;
 import com.wd.common.utils.ProcessUtils;
 import com.wd.common.utils.ToolsUtil;
-import com.wd.common.widget.CustomTitleBar;
-import com.wd.common.widget.DefaultView;
+import com.wd.foundation.wdkit.view.CustomTitleBar;
+import com.wd.foundation.wdkit.utils.StatusBarUtil;
+import com.wd.foundation.wdkit.view.DefaultView;
 import com.wd.fastcoding.base.R;
 import com.wd.foundation.bean.livedate.NetStateMessage;
 import com.wd.foundation.wdkit.mvvm.base.BaseMvvmActivity;
@@ -304,7 +305,7 @@ public abstract class BaseActivity extends BaseMvvmActivity implements CustomTit
     }
 
     public void setStatusBarStyle(@NonNull StatusBarStyleEnum statusBarStyle) {
-        ToolsUtil.setStatusBarStyle(statusBarStyle, this);
+        StatusBarUtil.setStatusBarStyle(statusBarStyle, this);
     }
 
     /**

@@ -14,7 +14,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.airbnb.lottie.LottieAnimationView;
 import com.wd.common.constant.UrlConstants;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.common.utils.ProcessUtils;
 import com.wd.fastcoding.base.R;
 import com.wd.foundation.bean.custom.content.ContentBean;

@@ -13,8 +13,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
-import com.wd.common.imageglide.ImageUtils;
-import com.wd.common.viewclick.BaseClickListener;
+import com.wd.foundation.wdkit.imageglide.ImageUtils;
+import com.wd.foundation.wdkit.viewclick.BaseClickListener;
 import com.wd.fastcoding.base.R;
 import com.wd.foundation.bean.response.CodeIdentifyBean;
 import com.wd.foundation.wdkit.animator.MyAnimationUtils;

@@ -14,7 +14,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
-import com.wd.common.viewclick.BaseClickListener;
+import com.wd.foundation.wdkit.viewclick.BaseClickListener;
 import com.wd.fastcoding.base.R;
 import com.wd.foundation.bean.utils.TimeUtil;
 

@@ -6,7 +6,7 @@ import com.wd.capability.network.fetcher.BaseDataFetcher;
 import com.wd.capability.network.response.BaseResponse;
 import com.wd.common.api.RequestApi;
 import com.wd.common.listener.IHistoryDataListener;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.foundation.bean.request.HistoryAddBean;
 import com.wd.foundation.bean.request.SimpleContentBean;
 import com.wd.foundation.bean.utils.TimeUtil;

@@ -3,9 +3,9 @@ package com.wd.common.fetcher;
 import android.text.TextUtils;
 
 
-import com.wd.common.listener.BatchCallback;
+import com.wd.capability.layout.ui.follow.listener.BatchCallback;
 import com.wd.common.listener.InteractionDataListener;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.capability.network.BaseObserver;
 import com.wd.capability.network.constant.ParameterConstant;
 import com.wd.capability.network.fetcher.BaseDataFetcher;

@@ -18,7 +18,7 @@ import androidx.core.view.ViewCompat;
 
 import com.hjq.shape.builder.ShapeDrawableBuilder;
 import com.hjq.shape.layout.ShapeConstraintLayout;
-import com.wd.common.base.BaseApplication;
+import com.wd.foundation.wdkit.base.BaseApplication;
 import com.wd.common.widget.ForbidDragSeekBar;
 import com.wd.common.widget.MarqueeNormalTextView;
 import com.wd.fastcoding.base.R;

@@ -6,7 +6,7 @@ import android.os.Handler;
 import com.wd.capability.network.BaseObserver;
 import com.wd.common.incentive.constants.TaskNameConstants;
 import com.wd.common.incentive.constants.TaskOperateTypeConstants;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.foundation.bean.TaskFinishBean;
 import com.wd.foundation.bean.incentive.PointLevelOperateBean;
 import com.wd.foundation.wdkit.constant.Constants;

@@ -4,12 +4,11 @@ import android.content.Context;
 import android.text.TextUtils;
 
 
-import com.wd.capability.network.constant.EventConstants;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.capability.network.utils.NetworkUtil;
 import com.wd.common.interact.collect.callback.CollectCallback;
 import com.wd.common.interact.collect.model.UserCollectFetcher;
 import com.wd.common.listener.AddFavoriteLabelCallback;
-import com.wd.common.utils.ToolsUtil;
 import com.wd.fastcoding.base.R;
 import com.wd.foundation.bean.collect.CollectContentBean;
 import com.wd.foundation.bean.custom.collect.AddDelCollectBean;
@@ -80,8 +79,8 @@ public class CollectTools {
                         collectContentBean.contentRelId = listBean.getContentRelId();
                         contentList.add(collectContentBean);
                     }
-                    ToolsUtil.showAddCollectLabelDialog(context,contentList,
-                            addFavoriteLabelCallback);
+//                    ToolsUtil.showAddCollectLabelDialog(context,contentList,
+//                            addFavoriteLabelCallback);
                 }
 
                 if (ArrayUtils.isNotEmpty(inputContentList) && inputContentList.get(0) != null){

@@ -6,7 +6,7 @@ import android.text.TextUtils;
 import androidx.lifecycle.LifecycleOwner;
 
 import com.wd.capability.network.BaseObserver;
-import com.wd.common.UIViewModel;
+import com.wd.foundation.wdkit.mvvm.vm.UIViewModel;
 import com.wd.common.interact.collect.CollectTools;
 import com.wd.common.interact.collect.callback.CollectCallback;
 import com.wd.common.listener.AddFavoriteLabelCallback;

@@ -2,7 +2,7 @@ package com.wd.common.interact.collect.model;
 
 import androidx.lifecycle.LifecycleOwner;
 
-import com.wd.common.UIViewModel;
+import com.wd.foundation.wdkit.mvvm.vm.UIViewModel;
 import com.wd.common.fetcher.InteractionStatusDataFetcher;
 import com.wd.common.listener.InteractionDataListener;
 import com.wd.foundation.bean.custom.content.ContentBean;

-package com.wd.common.interact.follow.listener;
-
-
-import com.wd.foundation.bean.response.FollowListIndexBean;
-import com.wd.foundation.wdkit.mvvm.vm.IVMCallback;
-
-/**
- * @author : gta
- * @description :
- * @since : 2022/7/13
- */
-public interface FollowDataListener extends IVMCallback {
-
-    /**
-     * 获取页面数据返回
-     *
-     */
-    void onGetDateSuccess(FollowListIndexBean mList);
-
-    /**
-     * 成功一键关注
-     */
-    void oneKeySuccess();
-
-    /**
-     * 获取页面数据失败返回
-     *
-     * @param type 失败
-     * @param error 错误信息
-     */
-    void onFailed(int type, String error);
-
-
-    /**
-     * 用户关注/取消关注接口
-     */
-    void onOperationSuccess();
-
-    /**
-     * 用户关注/取消关注接口
-     */
-    void onOperationFailed(String error);
-
-}

@@ -6,26 +6,24 @@ package com.wd.common.interact.follow.model;
 
 import android.text.TextUtils;
 
-
+import com.wd.capability.layout.ui.follow.listener.FollowDataListener;
+import com.wd.capability.layout.ui.follow.listener.GetBatchStatusListener;
+import com.wd.capability.layout.ui.follow.listener.GetFollowStatusListener;
 import com.wd.capability.network.BaseObserver;
-import com.wd.capability.network.constant.EventConstants;
 import com.wd.capability.network.constant.ParameterConstant;
 import com.wd.capability.network.fetcher.BaseDataFetcher;
 import com.wd.capability.network.response.BaseResponse;
 import com.wd.common.api.RequestApi;
-import com.wd.common.incentive.constants.TaskOperateTypeConstants;
-import com.wd.common.incentive.task.TaskManager;
-import com.wd.common.interact.follow.listener.FollowDataListener;
-import com.wd.common.utils.PDUtils;
 import com.wd.fastcoding.base.R;
 import com.wd.foundation.bean.custom.content.PeopleMasterBean;
 import com.wd.foundation.bean.livedate.EventMessage;
 import com.wd.foundation.bean.response.FollowBean;
 import com.wd.foundation.bean.response.FollowListIndexBean;
 import com.wd.foundation.bean.response.MasterFollowsStatusBean;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.foundation.wdkit.constant.IntentConstants;
-import com.wd.foundation.wdkit.mvvm.vm.IVMCallback;
 import com.wd.foundation.wdkit.utils.CommonUtil;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.foundation.wdkit.utils.SpUtils;
 import com.wd.foundation.wdkit.utils.ToastNightUtil;
 import com.wd.foundation.wdkitcore.livedata.LiveDataBus;
@@ -101,7 +99,7 @@ public class FollowDataFetcher extends BaseDataFetcher<RequestApi> {
             public void onSuccess(String mData) {
                 if(status == 1){
                     //执行任务：关注
-                    TaskManager.getInstance().executePointLevelOperate(TaskOperateTypeConstants.FOLLOW);
+//                    TaskManager.getInstance().executePointLevelOperate(TaskOperateTypeConstants.FOLLOW);
                 }
                 if (mListener != null) {
                     mListener.onOperationSuccess();
@@ -406,21 +404,4 @@ public class FollowDataFetcher extends BaseDataFetcher<RequestApi> {
     }
 
 
-    public interface GetFollowStatusListener extends IVMCallback {
-        /**
-         * 目的是关注状态列表接口
-         */
-        void onSuccess(MasterFollowsStatusBean mObj);
-
-    }
-
-    public interface GetBatchStatusListener extends IVMCallback {
-        /**
-         * 目的是关注状态列表接口
-         */
-        void onSuccess(List<MasterFollowsStatusBean> list);
-
-        void error(String e);
-
-    }
 }

@@ -2,7 +2,7 @@
  * Copyright (c) Wondertek Technologies Co., Ltd. 2021-2022. All rights reserved.
  */
 
-package com.wd.capability.layout.ui.follow.model;
+package com.wd.common.interact.follow.model;
 
 import android.text.TextUtils;
 
@@ -10,11 +10,10 @@ import android.text.TextUtils;
 import com.wd.capability.layout.comp.layoutdata.AbsGroup;
 import com.wd.capability.layout.comp.layoutdata.Page;
 import com.wd.capability.layout.comp.parser.ChannelSectionParser;
-import com.wd.common.listener.BatchCallback;
+import com.wd.capability.layout.ui.follow.listener.BatchCallback;
 import com.wd.capability.layout.ui.follow.listener.HomeFollowDataListener;
 import com.wd.capability.layout.uitls.CompentLogicUtil;
 import com.wd.common.fetcher.InteractionStatusDataFetcher;
-import com.wd.common.utils.PDUtils;
 import com.wd.capability.network.BaseObserver;
 import com.wd.capability.network.bean.MetaBean;
 import com.wd.capability.network.cachedata.CacheData;
@@ -41,6 +40,7 @@ import com.wd.foundation.bean.response.MasterFollowsStatusBean;
 import com.wd.foundation.wdkit.json.GsonUtils;
 import com.wd.foundation.wdkit.mvvm.model.ConditionTask;
 import com.wd.foundation.bean.utils.TimeUtil;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.foundation.wdkit.utils.ToastNightUtil;
 import com.wd.foundation.wdkitcore.tools.HostUtil;
 import com.wd.foundation.wdkitcore.tools.StringUtils;

@@ -3,7 +3,7 @@
  * Copyright (c) Wondertek Technologies Co., Ltd. 2021-2022. All rights reserved.
  */
 
-package com.wd.capability.layout.ui.follow.model;
+package com.wd.common.interact.follow.model;
 
 import com.wd.capability.layout.ui.follow.listener.LocalAskDataListener;
 import com.wd.capability.network.BaseObserver;

@@ -4,8 +4,10 @@ package com.wd.common.interact.follow.vm;
 import androidx.lifecycle.LifecycleOwner;
 
 
-import com.wd.common.UIViewModel;
-import com.wd.common.interact.follow.listener.FollowDataListener;
+import com.wd.capability.layout.ui.follow.listener.FollowDataListener;
+import com.wd.capability.layout.ui.follow.listener.GetBatchStatusListener;
+import com.wd.capability.layout.ui.follow.listener.GetFollowStatusListener;
+import com.wd.foundation.wdkit.mvvm.vm.UIViewModel;
 import com.wd.common.interact.follow.model.FollowDataFetcher;
 
 import java.util.List;
@@ -54,7 +56,7 @@ public class FollowViewModel extends UIViewModel {
     /**
      * 批量查询创作者关注状态
      */
-    public void getMasterStatusRequest(String creatorId, FollowDataFetcher.GetFollowStatusListener mGetFollowStatusListener){
+    public void getMasterStatusRequest(String creatorId, GetFollowStatusListener mGetFollowStatusListener){
         if (mDataFetcher==null){
             mDataFetcher = new FollowDataFetcher(mDataListener);
         }
@@ -65,7 +67,7 @@ public class FollowViewModel extends UIViewModel {
     /**
      * 批量查询创作者关注状态
      */
-    public void getBatchStatusRequest(List<String> creatorIds, FollowDataFetcher.GetBatchStatusListener mGetBatchStatusListener){
+    public void getBatchStatusRequest(List<String> creatorIds, GetBatchStatusListener mGetBatchStatusListener){
         if (mDataFetcher==null){
             mDataFetcher = new FollowDataFetcher(mDataListener);
         }

@@ -4,7 +4,7 @@ package com.wd.common.interact.interacts;
 
 import androidx.lifecycle.LifecycleOwner;
 
-import com.wd.common.UIViewModel;
+import com.wd.foundation.wdkit.mvvm.vm.UIViewModel;
 import com.wd.common.interact.interacts.callback.IInteractDataListener;
 import com.wd.common.interact.interacts.callback.IInteractDataViewModel;
 import com.wd.common.interact.interacts.fetcher.InteractFetcher;

 package com.wd.common.interact.like;
 
 
-import com.wd.capability.network.constant.EventConstants;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.common.interact.like.callback.LikeCallback;
 import com.wd.common.interact.like.model.UserLikeFetcher;
 import com.wd.foundation.bean.livedate.EventMessage;

@@ -3,7 +3,7 @@ package com.wd.common.interact.like;
 
 import com.wd.common.interact.like.callback.QueryLikeStatusCallback;
 import com.wd.common.interact.like.model.QueryLikeStatusFetcher;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.foundation.bean.comment.DisplayWorkInfoBean;
 
 import java.lang.ref.WeakReference;

@@ -13,7 +13,7 @@ import com.wd.capability.network.BaseObserver;
 import com.wd.capability.network.RetrofitClient;
 import com.wd.capability.network.bean.MetaBean;
 import com.wd.capability.network.bean.TokenBean;
-import com.wd.capability.network.constant.EventConstants;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.capability.network.constant.NetConstant;
 import com.wd.capability.network.constant.ParameterConstant;
 import com.wd.capability.network.interceptor.LoggingInterceptor;

@@ -9,7 +9,7 @@ import android.net.NetworkInfo;
 
 import com.wd.base.log.Logger;
 import com.wd.capability.network.constant.NetConstant;
-import com.wd.capability.network.constant.EventConstants;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.foundation.bean.livedate.NetStateMessage;
 import com.wd.foundation.wdkitcore.livedata.LiveDataBus;
 

@@ -22,9 +22,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
-import com.wd.common.imageglide.ImageUtils;
-import com.wd.common.viewclick.BaseClickListener;
-import com.wd.common.widget.RoundRectImageView;
+import com.wd.foundation.wdkit.imageglide.ImageUtils;
+import com.wd.foundation.wdkit.viewclick.BaseClickListener;
+import com.wd.foundation.wdkit.view.RoundRectImageView;
 import com.wd.fastcoding.base.R;
 import com.wd.foundation.wdkit.statusbar.StatusBarCompat;
 import com.wd.foundation.bean.utils.TimeUtil;

@@ -6,12 +6,13 @@ import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.wd.base.log.Logger;
+import com.wd.capability.layout.ui.follow.listener.GetFollowStatusListener;
 import com.wd.capability.network.BaseObserver;
 import com.wd.capability.network.RetrofitClient;
 import com.wd.capability.network.bean.MetaBean;
 import com.wd.capability.network.cachedata.CacheData;
 import com.wd.capability.network.cachedata.CacheH5PageData;
-import com.wd.capability.network.constant.EventConstants;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.capability.network.constant.ParameterConstant;
 import com.wd.capability.network.fetcher.BaseDataFetcher;
 import com.wd.capability.network.response.BaseResponse;
@@ -66,6 +67,7 @@ import com.wd.foundation.bean.response.MasterFollowsStatusBean;
 import com.wd.foundation.bean.response.MyAskMarkBean;
 import com.wd.foundation.bean.response.NewsDetailBean;
 import com.wd.foundation.bean.response.PersonalInfoBean;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.foundation.wdkitcore.constant.BaseConstants;
 import com.wd.foundation.wdkit.constant.IntentConstants;
 import com.wd.foundation.wdkit.file.MyFileUtils;
@@ -757,7 +759,7 @@ public class CommonNetUtils extends BaseDataFetcher<RequestApi> {
     /**
      * 查询单个创作者关注状态
      */
-    public void getMasterStatusRequest(String creatorId, FollowDataFetcher.GetFollowStatusListener mGetFollowStatusListener) {
+    public void getMasterStatusRequest(String creatorId, GetFollowStatusListener mGetFollowStatusListener) {
         //未登录不需调用
         if (TextUtils.isEmpty(SpUtils.getUserToken())) {
             return;

@@ -14,6 +14,7 @@ import com.wd.foundation.bean.request.SimpleContentBean;
 import com.wd.foundation.bean.response.NewsDetailBean;
 import com.wd.foundation.wdkit.json.GsonUtils;
 import com.wd.foundation.bean.utils.TimeUtil;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.foundation.wdkitcore.thread.ThreadPoolUtils;
 import com.wd.foundation.wdkitcore.tools.AppContext;
 import com.wd.foundation.wdkitcore.tools.StringUtils;

@@ -9,11 +9,10 @@ import android.text.TextUtils;
 
 import com.google.gson.JsonObject;
 import com.wd.base.log.Logger;
-import com.wd.capability.network.constant.EventConstants;
 import com.wd.capability.router.WdRouterRule;
 import com.wd.capability.router.data.ActionBean;
-import com.wd.common.base.BaseApplication;
-import com.wd.common.constant.PageNameConstants;
+import com.wd.foundation.wdkit.constant.PageNameConstants;
+import com.wd.common.constant.RouterConstants;
 import com.wd.common.manager.AudioThemManager;
 import com.wd.fastcoding.base.R;
 import com.wd.foundation.bean.custom.MenuBean;
@@ -24,10 +23,11 @@ import com.wd.foundation.bean.custom.comp.ChannelInfoBean;
 import com.wd.foundation.bean.custom.video.VodDetailIntentBean;
 import com.wd.foundation.bean.music.bean.VoicePlayerBean;
 import com.wd.foundation.bean.paper.PaperPageItemBean;
+import com.wd.foundation.wdkit.base.BaseApplication;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.foundation.wdkit.constant.GloadLogicParams;
 import com.wd.foundation.wdkit.constant.IntentConstants;
-import com.wd.common.constant.RouterConstants;
-import com.wd.common.imageglide.ImageUtils;
+import com.wd.foundation.wdkit.imageglide.ImageUtils;
 import com.wd.foundation.bean.custom.comp.CompBean;
 import com.wd.foundation.bean.custom.comp.CompDataSourceBean;
 import com.wd.foundation.bean.custom.content.ContentBean;

@@ -30,7 +30,6 @@ import com.wd.foundation.wdkit.file.MyFileUtils;
 import com.wd.foundation.wdkit.perloader.DeviceHelper;
 import com.wd.foundation.wdkit.statusbar.StatusBarCompat;
 import com.wd.foundation.wdkit.statusbar.StatusBarStyleEnum;
-import com.wd.foundation.wdkitcore.tools.AppContext;
 import com.wd.foundation.wdkitcore.tools.ResUtils;
 import com.yalantis.ucrop.UCrop;
 
@@ -450,55 +449,6 @@ public class ToolsUtil {
 //
 //    }
 
-    public static void setStatusBarStyle(@NonNull StatusBarStyleEnum statusBarStyle, int navigatonBarBgColor, Activity activity) {
-        if (statusBarStyle.isFullScreen()) {
-
-            if (-1 == statusBarStyle.getColorId()) {
-                // 全屏，即，沉浸式状态栏。需要自己处理好页面内容，因为部分内容会顶到状态栏底部
-                StatusBarCompat.fullScreenNoStatusBar(activity, navigatonBarBgColor);
-            } else {
-                // 全屏，即，沉浸式状态栏。需要自己处理好页面内容，因为部分内容会顶到状态栏底部
-                StatusBarCompat.fullScreenStatusBar(activity, Color.TRANSPARENT, navigatonBarBgColor, statusBarStyle.isLabelIsBlack());
-            }
-
-        } else {
-            // 修改状态栏背景色，非全屏
-            int state = statusBarStyle.isLabelIsBlack() ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-                    : View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-            StatusBarCompat.setStatusBar(activity, state, statusBarStyle.getColorId());
-        }
-    }
-
-
-    public static void setStatusBarStyle(@NonNull StatusBarStyleEnum statusBarStyle, Activity activity) {
-        if(activity == null){
-            return;
-        }
-        // 获取底部导航栏背景色
-        int navigatonBarBgColor = ContextCompat.getColor(activity,R.color.res_color_common_C8);
-        if (activity instanceof StatusBarCompat.NavigationBarInterface){
-            navigatonBarBgColor = ((StatusBarCompat.NavigationBarInterface)activity).getNavigationBarBgColor();
-        }
-        if (statusBarStyle.isFullScreen()) {
-            if (-1 == statusBarStyle.getColorId()) {
-                // 全屏，即，沉浸式状态栏。需要自己处理好页面内容，因为部分内容会顶到状态栏底部
-                StatusBarCompat.fullScreenNoStatusBar(activity, navigatonBarBgColor);
-            } else {
-                // 全屏，即，沉浸式状态栏。需要自己处理好页面内容，因为部分内容会顶到状态栏底部
-                StatusBarCompat.fullScreenStatusBar(activity, Color.TRANSPARENT, navigatonBarBgColor, statusBarStyle.isLabelIsBlack());
-            }
-
-        } else {
-            // 修改状态栏背景色，非全屏
-            int state = statusBarStyle.isLabelIsBlack() ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-                    : View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
-            StatusBarCompat.setStatusBar(activity, state, statusBarStyle.getColorId(),navigatonBarBgColor);
-            if(DeviceHelper.isMIUI()){
-                StatusBarCompat.setMiuiStatusBarDarkMode(statusBarStyle.isLabelIsBlack(),activity);
-            }
-        }
-    }
-
     /**
      * 直播间点赞样式数据转换，给横屏直播和竖屏直播使用
      *

@@ -2,7 +2,7 @@ package com.wd.common.utils;
 
 
 
-import com.wd.common.constant.PageNameConstants;
+import com.wd.foundation.wdkit.constant.PageNameConstants;
 import com.wd.foundation.bean.custom.NavigationBeanNews;
 import com.wd.foundation.bean.custom.comp.ContainerItemBean;
 import com.wd.foundation.bean.custom.content.ContentBean;

@@ -18,7 +18,7 @@ import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.wd.common.dialog.DialogUtils;
+import com.wd.foundation.wdkit.utils.DialogUtils;
 import com.wd.common.interact.collect.CollectTools;
 import com.wd.common.interact.collect.callback.CollectCallback;
 import com.wd.common.interact.interacts.callback.IInteractDataListener;
@@ -28,7 +28,7 @@ import com.wd.common.interact.like.QueryLikeStatusTools;
 import com.wd.common.interact.like.callback.LikeCallback;
 import com.wd.common.interact.like.callback.QueryLikeStatusCallback;
 import com.wd.common.listener.AddFavoriteLabelCallback;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.common.utils.ProcessUtils;
 import com.wd.common.utils.ToolsUtil;
 import com.wd.fastcoding.base.R;

@@ -28,7 +28,7 @@ import com.wd.common.interact.like.QueryLikeStatusTools;
 import com.wd.common.interact.like.callback.LikeCallback;
 import com.wd.common.interact.like.callback.QueryLikeStatusCallback;
 import com.wd.common.listener.AddFavoriteLabelCallback;
-import com.wd.common.utils.PDUtils;
+import com.wd.foundation.wdkit.utils.PDUtils;
 import com.wd.common.utils.ProcessUtils;
 import com.wd.common.utils.ToolsUtil;
 import com.wd.fastcoding.base.R;

-package com.wd.common.widget.progress;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
-
-import androidx.annotation.Nullable;
-
-import com.wd.fastcoding.base.R;
-import com.wd.foundation.wdkit.utils.SpUtils;
-
-
-/**
- * @Description: 组件和稿件页面的骨架图
- * @Author: Li Yubing
- * @Email: liyubing@wondert.com.cn
- * @CreateDate: 2023/10/23 10:09
- * @Version: 1.0
- */
-public class SkeletonLoadingView extends FrameLayout {
-
-    private Context context;
-
-    public SkeletonLoadingView(Context context) {
-        this(context, null);
-    }
-
-    public SkeletonLoadingView(Context context, @Nullable AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SkeletonLoadingView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        this.context = context;
-        init();
-    }
-
-    private void init() {
-        LayoutInflater.from(context).inflate(R.layout.small_skeleton_loading_view, this, true);
-        ImageView img = findViewById(R.id.img);
-        img.setBackgroundResource(SpUtils.isNightMode() ? R.mipmap.bg_gujia_default_image_night :
-        R.mipmap.bg_gujia_default_image);
-    }
-
-
-}

@@ -80,7 +80,7 @@
             android:visibility="visible"
             android:orientation="horizontal">
 
-            <com.wd.common.widget.RoundRectImageView
+            <com.wd.foundation.wdkit.view.RoundRectImageView
                 android:id="@+id/push_image"
                 android:layout_width="@dimen/rmrb_dp72"
                 android:layout_height="wrap_content"

@@ -43,8 +43,4 @@
     <declare-styleable name="ClearScreenLayout">
         <attr name="touch_slop_sensitivity" format="float" />
     </declare-styleable>
-    <!--    缺省视图-->
-    <declare-styleable name="DefaultView">
-        <attr name="default_view_type" format="integer" />
-    </declare-styleable>
 </resources>
\ No newline at end of file

@@ -121,7 +121,6 @@
     <string name="sure_clear_cache">是否确认清除此APP的缓存</string>
     <string name="sure_clear_common">Are you sure to delete?</string>
     <string name="sure_clear_search_history">确认清空历史记录？</string>
-    <string name="yes_btn">确定</string>
     <string name="open_btn">打开</string>
     <string name="cancel_btn">取消</string>
     <string name="yes_bind">确认解绑？</string>
@@ -129,7 +128,6 @@
     <string name="cancel_bind_message">绑定失败</string>
     <string name="cancel_bind_message_2">该账号不符合绑定要求或已经被绑定</string>
     <string name="tv_bind">解绑后讲无法继续使用该账号登录人民日报平台</string>
-    <string name="tips">提示</string>
     <string name="next">下一页</string>
     <string name="abandon">放弃</string>
     <string name="delete">删除</string>
@@ -368,7 +366,6 @@
     <!--暂无搜索结果-->
     <string name="default_no_content_found">未找到内容</string>
 
-    <string name="up_load_more">上拉加载更多</string>
     <string name="no_net_tips">无网络</string>
     <string name="weak_net_tips">网络有问题。请检查网络</string>
     <string name="click_retry">重试</string>
@@ -377,8 +374,6 @@
     <string name="seal_login_user_logout">用户已注销</string>
     <string name="seal_login_user_blocked">这个账号被封了！</string>
 
-    <string name="to_expand_hint">展开</string>
-    <string name="to_shrink_hint">收起</string>
     <!--    加入聊天室失败-->
     <string name="discovery_chat_room_join_failure">加入聊天室失败 </string>
     <!--    你被禁止加入聊天室-->

@@ -39,7 +39,10 @@ android {
 dependencies {
     implementation rootProject.ext.dependencies["androidxAppCompat"]
     implementation rootProject.ext.dependencies["material"]
+    implementation project(path: ':wdkit')
     implementation project(path: ':wdlayout')
+    implementation project(path: ':lib_base')
+    implementation project(path: ':base_comment')
     api project(path: ':wdrouter')
     api project(path: ':wdinterface')
     annotationProcessor 'com.alibaba:arouter-compiler:1.5.2'

@@ -44,11 +44,10 @@ import com.wd.capability.network.constant.NetConstant;
 import com.wd.common.base.BaseActivity;
 //import com.wd.common.base.BaseDialog;
 import com.wd.foundation.wdkit.constant.Constants;
-import com.wd.capability.network.constant.EventConstants;
+import com.wd.foundation.wdkit.constant.EventConstants;
 import com.wd.common.constant.RouterConstants;
-import com.wd.common.imageglide.ImageUtils;
 import com.wd.common.net.NetStateChangeReceiver;
-import com.wd.common.utils.GrayManager;
+import com.wd.foundation.wdkit.utils.GrayManager;
 import com.wd.common.utils.ProcessUtils;
 import com.wd.foundation.wdkit.constant.ProtocolConstant;
 import com.wd.foundation.bean.custom.MenuBean;
@@ -57,6 +56,7 @@ import com.wd.foundation.bean.custom.video.TouchBean;
 import com.wd.foundation.bean.livedate.NetStateMessage;
 import com.wd.foundation.bean.response.BottomNavBean;
 import com.wd.foundation.bean.response.MourningModelBean;
+import com.wd.foundation.wdkit.imageglide.ImageUtils;
 import com.wd.foundation.wdkit.statusbar.StatusBarStyleEnum;
 import com.wd.foundation.wdkit.system.FastClickUtil;
 import com.wd.foundation.wdkit.utils.FilletUtil;

@@ -8,13 +8,13 @@ import android.widget.FrameLayout;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.fastjson.JSONObject;
-import com.wd.capability.layout.page.ItemElectronPapterLayoutManager;
+import com.wd.module_home.paper.ItemElectronPapterLayoutManager;
 import com.wd.capability.router.data.ActionBean;
 import com.wd.common.base.BaseActivity;
-import com.wd.common.constant.PageNameConstants;
+import com.wd.foundation.wdkit.constant.PageNameConstants;
 import com.wd.common.constant.RegionNameConstants;
 import com.wd.common.constant.RouterConstants;
-import com.wd.common.utils.BarUtils;
+import com.wd.foundation.wdkit.utils.BarUtils;
 import com.wd.foundation.bean.analytics.TrackContentBean;
 import com.wd.foundation.bean.custom.MenuBean;
 import com.wd.foundation.wdkit.constant.GlobalAppCacheData;

-package com.wd.capability.layout.comp.layoutmanager.adapter.paper;
+package com.wd.module_home.adapter.paper;
 
 /**
  * Created by lxy on 2016/10/11.

-package com.wd.capability.layout.comp.layoutmanager.adapter.paper;
+package com.wd.module_home.adapter.paper;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -13,8 +13,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.wd.capability.layout.R;
 import com.wd.capability.layout.ui.widget.paper.AreaImageView;
 import com.wd.capability.layout.uitls.ObjectTools;
-import com.wd.common.imageglide.ImageUtils;
 import com.wd.common.utils.ProcessUtils;
+import com.wd.foundation.wdkit.imageglide.ImageUtils;
+
 import com.wd.foundation.bean.paper.PaperPageBean;
 import com.wd.foundation.bean.paper.PaperPageItemBean;
 

-package com.wd.capability.layout.ui.paper;
+package com.wd.module_home.paper;
 
-import android.content.DialogInterface;
 import android.view.View;
 
 import androidx.fragment.app.FragmentActivity;
 
-import com.wd.capability.layout.page.ItemElectronPapterLayoutManager;
 import com.wd.capability.network.response.ExceptionHandle;
 import com.wd.capability.network.utils.NetworkUtil;
-import com.wd.common.viewclick.BaseClickListener;
+import com.wd.foundation.wdkit.viewclick.BaseClickListener;
 import com.wd.foundation.bean.paper.PaperNumInforBean;
 import com.wd.foundation.bean.paper.PaperPageBean;
 import com.wd.foundation.wdkit.utils.ToastNightUtil;

-package com.wd.capability.layout.ui.paper;
+package com.wd.module_home.paper;
 
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
@@ -19,7 +19,6 @@ import androidx.fragment.app.FragmentActivity;
 
 
 import com.wd.capability.layout.R;
-import com.wd.capability.layout.page.ItemElectronPapterLayoutManager;
 import com.wd.capability.layout.ui.widget.calendar.CalendarView;
 import com.wd.capability.layout.ui.widget.calendar.DateData;
 import com.wd.capability.layout.ui.widget.calendar.MonthListener;

-package com.wd.capability.layout.page;
+package com.wd.module_home.paper;
 
 import android.text.TextUtils;
 import android.view.View;
@@ -12,11 +12,8 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.wd.capability.layout.R;
 import com.wd.capability.layout.comp.layoutmanager.ItemContainerManager;
-import com.wd.capability.layout.ui.paper.PaperContract;
-import com.wd.capability.layout.ui.paper.PaperHelpFactory;
-import com.wd.capability.layout.ui.paper.PaperHelper;
-import com.wd.common.imageglide.ImageUtils;
-import com.wd.common.viewclick.BaseClickListener;
+import com.wd.foundation.wdkit.imageglide.ImageUtils;
+import com.wd.foundation.wdkit.viewclick.BaseClickListener;
 import com.wd.foundation.bean.custom.MenuBean;
 import com.wd.foundation.bean.paper.PaperPageBean;
 import com.wd.foundation.bean.utils.TimeUtil;

-package com.wd.capability.layout.ui.paper;
+package com.wd.module_home.paper;
 
 
 import android.view.View;
@@ -10,7 +10,6 @@ import androidx.recyclerview.widget.RecyclerView;
 
 
 import com.wd.capability.layout.R;
-import com.wd.capability.layout.page.ItemElectronPapterLayoutManager;
 import com.wd.foundation.bean.paper.PaperPageBean;
 import com.wd.foundation.wdkitcore.tools.ArrayUtils;