fastcoding / commonProject

Go to a project
Toggle navigation Toggle navigation pinning
wangkai
c107aada 1 parent 9889bcc8

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

Inline Side-by-side
Showing 100 changed files with 218 additions and 396 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 100+ files are displayed.

@@ -61,6 +61,7 @@ dependencies { @@ -61,6 +61,7 @@ dependencies {
61 implementation rootProject.ext.dependencies["material"] 61 implementation rootProject.ext.dependencies["material"]
62 implementation project(':lib_base') 62 implementation project(':lib_base')
63 implementation project(path: ':wdinterfaceimpl') 63 implementation project(path: ':wdinterfaceimpl')
  64 + implementation project(path: ':wdlayoutdataimpl')
64 implementation project(path: ':module_home') 65 implementation project(path: ':module_home')
65 implementation project(path: ':module_videoplayer') 66 implementation project(path: ':module_videoplayer')
66 implementation project(path: ':module_personalcenter') 67 implementation project(path: ':module_personalcenter')
@@ -8,7 +8,6 @@ import android.os.Bundle; @@ -8,7 +8,6 @@ import android.os.Bundle;
8 import androidx.annotation.Nullable; 8 import androidx.annotation.Nullable;
9 9
10 import com.wd.common.utils.ProcessUtils; 10 import com.wd.common.utils.ProcessUtils;
11 -import com.wd.module_home.AppMainActivity;  
12 11
13 public class MainActivity extends Activity { 12 public class MainActivity extends Activity {
14 13
@@ -4,7 +4,7 @@ package com.wd.fastcoding.app; @@ -4,7 +4,7 @@ package com.wd.fastcoding.app;
4 import com.hjq.toast.Toaster; 4 import com.hjq.toast.Toaster;
5 import com.wd.capability.network.RetrofitClient; 5 import com.wd.capability.network.RetrofitClient;
6 import com.wd.capability.router.ArouteInit; 6 import com.wd.capability.router.ArouteInit;
7 -import com.wd.common.base.BaseApplication; 7 +import com.wd.foundation.wdkit.base.BaseApplication;
8 import com.wd.fastcoding.app.start.StartTaskConfig; 8 import com.wd.fastcoding.app.start.StartTaskConfig;
9 import com.wd.foundation.wdkit.utils.CommonUtil; 9 import com.wd.foundation.wdkit.utils.CommonUtil;
10 import com.wd.foundation.wdkitcore.tools.AppContext; 10 import com.wd.foundation.wdkitcore.tools.AppContext;
@@ -38,6 +38,7 @@ dependencies { @@ -38,6 +38,7 @@ dependencies {
38 api rootProject.ext.dependencies["gson"] 38 api rootProject.ext.dependencies["gson"]
39 // implementation project(path: ':base_umeng') 39 // implementation project(path: ':base_umeng')
40 implementation project(path: ':base_speech') 40 implementation project(path: ':base_speech')
  41 + implementation project(path: ':wdlayout')
41 api project(path: ':lib_base') 42 api project(path: ':lib_base')
42 implementation project(':aar_repo:lib_speech') 43 implementation project(':aar_repo:lib_speech')
43 implementation rootProject.ext.dependencies["eventbus"] 44 implementation rootProject.ext.dependencies["eventbus"]
@@ -15,8 +15,8 @@ import com.people.comment.view_holder.CommentTitleViewHolder; @@ -15,8 +15,8 @@ import com.people.comment.view_holder.CommentTitleViewHolder;
15 import com.people.comment.view_holder.EmptyCommentViewHolder; 15 import com.people.comment.view_holder.EmptyCommentViewHolder;
16 import com.people.comment.view_holder.MoreCommentViewHolder; 16 import com.people.comment.view_holder.MoreCommentViewHolder;
17 import com.people.comment.view_holder.NoMoreCommentViewHolder; 17 import com.people.comment.view_holder.NoMoreCommentViewHolder;
18 -import com.wd.common.constant.PageNameConstants;  
19 -import com.wd.common.widget.DefaultView; 18 +import com.wd.foundation.wdkit.constant.PageNameConstants;
  19 +import com.wd.foundation.wdkit.view.DefaultView;
20 import com.wd.foundation.bean.custom.content.CommentItem; 20 import com.wd.foundation.bean.custom.content.CommentItem;
21 import com.wd.foundation.wdkitcore.tools.ResUtils; 21 import com.wd.foundation.wdkitcore.tools.ResUtils;
22 22
@@ -9,7 +9,7 @@ import android.widget.FrameLayout; @@ -9,7 +9,7 @@ import android.widget.FrameLayout;
9 import android.widget.ImageView; 9 import android.widget.ImageView;
10 10
11 import com.people.comment.R; 11 import com.people.comment.R;
12 -import com.wd.common.imageglide.ImageUtils; 12 +import com.wd.foundation.wdkit.imageglide.ImageUtils;
13 import com.wd.foundation.wdkit.utils.ScreenUtils; 13 import com.wd.foundation.wdkit.utils.ScreenUtils;
14 14
15 import java.util.ArrayList; 15 import java.util.ArrayList;
@@ -22,9 +22,9 @@ import androidx.core.content.ContextCompat; @@ -22,9 +22,9 @@ import androidx.core.content.ContextCompat;
22 import com.chad.library.adapter.base.BaseViewHolder; 22 import com.chad.library.adapter.base.BaseViewHolder;
23 import com.people.comment.R; 23 import com.people.comment.R;
24 import com.wd.common.base.BaseSplitAdapter; 24 import com.wd.common.base.BaseSplitAdapter;
25 -import com.wd.common.imageglide.ImageUtils;  
26 -import com.wd.common.viewclick.BaseClickListener;  
27 -import com.wd.common.widget.ExpandableTextView; 25 +import com.wd.foundation.wdkit.imageglide.ImageUtils;
  26 +import com.wd.foundation.wdkit.viewclick.BaseClickListener;
  27 +import com.wd.foundation.wdkit.view.ExpandableTextView;
28 import com.wd.foundation.bean.custom.content.CommentItem; 28 import com.wd.foundation.bean.custom.content.CommentItem;
29 import com.wd.foundation.bean.response.ParentCommentVoBean; 29 import com.wd.foundation.bean.response.ParentCommentVoBean;
30 import com.wd.foundation.bean.utils.TimeUtil; 30 import com.wd.foundation.bean.utils.TimeUtil;
@@ -19,11 +19,10 @@ import androidx.core.content.ContextCompat; @@ -19,11 +19,10 @@ import androidx.core.content.ContextCompat;
19 import com.chad.library.adapter.base.BaseViewHolder; 19 import com.chad.library.adapter.base.BaseViewHolder;
20 import com.people.comment.R; 20 import com.people.comment.R;
21 import com.wd.common.base.BaseSplitAdapter; 21 import com.wd.common.base.BaseSplitAdapter;
22 -import com.wd.common.imageglide.ImageUtils;  
23 -import com.wd.common.viewclick.BaseClickListener;  
24 -import com.wd.common.widget.ExpandableTextView; 22 +import com.wd.foundation.wdkit.imageglide.ImageUtils;
  23 +import com.wd.foundation.wdkit.viewclick.BaseClickListener;
  24 +import com.wd.foundation.wdkit.view.ExpandableTextView;
25 import com.wd.foundation.bean.custom.content.CommentItem; 25 import com.wd.foundation.bean.custom.content.CommentItem;
26 -import com.wd.foundation.bean.music.bean.VoicePlayerBean;  
27 import com.wd.foundation.bean.response.ParentCommentVoBean; 26 import com.wd.foundation.bean.response.ParentCommentVoBean;
28 import com.wd.foundation.wdkit.perloader.DeviceHelper; 27 import com.wd.foundation.wdkit.perloader.DeviceHelper;
29 import com.wd.foundation.wdkitcore.tools.AppContext; 28 import com.wd.foundation.wdkitcore.tools.AppContext;
@@ -10,7 +10,7 @@ import com.people.comment.listener.MyCommentListDataListener; @@ -10,7 +10,7 @@ import com.people.comment.listener.MyCommentListDataListener;
10 import com.people.comment.listener.SubmitMyCommentListListener; 10 import com.people.comment.listener.SubmitMyCommentListListener;
11 import com.wd.capability.network.BaseObserver; 11 import com.wd.capability.network.BaseObserver;
12 import com.wd.capability.network.bean.MetaBean; 12 import com.wd.capability.network.bean.MetaBean;
13 -import com.wd.capability.network.constant.EventConstants; 13 +import com.wd.foundation.wdkit.constant.EventConstants;
14 import com.wd.capability.network.constant.ParameterConstant; 14 import com.wd.capability.network.constant.ParameterConstant;
15 import com.wd.capability.network.fetcher.BaseDataFetcher; 15 import com.wd.capability.network.fetcher.BaseDataFetcher;
16 import com.wd.capability.network.response.BaseResponse; 16 import com.wd.capability.network.response.BaseResponse;
@@ -19,7 +19,7 @@ import com.wd.common.incentive.constants.TaskOperateTypeConstants; @@ -19,7 +19,7 @@ import com.wd.common.incentive.constants.TaskOperateTypeConstants;
19 import com.wd.common.incentive.task.TaskManager; 19 import com.wd.common.incentive.task.TaskManager;
20 import com.wd.common.interact.ICommentDataNewListener; 20 import com.wd.common.interact.ICommentDataNewListener;
21 import com.wd.common.utils.CommonNetUtils; 21 import com.wd.common.utils.CommonNetUtils;
22 -import com.wd.common.utils.PDUtils; 22 +import com.wd.foundation.wdkit.utils.PDUtils;
23 import com.wd.foundation.bean.comment.CommentListBean; 23 import com.wd.foundation.bean.comment.CommentListBean;
24 import com.wd.foundation.bean.comment.CommentStatusBean; 24 import com.wd.foundation.bean.comment.CommentStatusBean;
25 import com.wd.foundation.bean.custom.content.CommentItem; 25 import com.wd.foundation.bean.custom.content.CommentItem;
@@ -7,7 +7,7 @@ import com.people.comment.listener.BatchMyCommentListLikeStatusListener; @@ -7,7 +7,7 @@ import com.people.comment.listener.BatchMyCommentListLikeStatusListener;
7 import com.people.comment.listener.DeleteMyCommentListListener; 7 import com.people.comment.listener.DeleteMyCommentListListener;
8 import com.people.comment.listener.MyCommentListDataListener; 8 import com.people.comment.listener.MyCommentListDataListener;
9 import com.people.comment.listener.SubmitMyCommentListListener; 9 import com.people.comment.listener.SubmitMyCommentListListener;
10 -import com.wd.common.UIViewModel; 10 +import com.wd.foundation.wdkit.mvvm.vm.UIViewModel;
11 import com.wd.common.interact.ICommentDataNewListener; 11 import com.wd.common.interact.ICommentDataNewListener;
12 import com.wd.common.interfaces.OnGetContentBeanSuccessListener; 12 import com.wd.common.interfaces.OnGetContentBeanSuccessListener;
13 import com.wd.common.utils.CommonNetUtils; 13 import com.wd.common.utils.CommonNetUtils;
@@ -3,7 +3,7 @@ package com.people.comment.comment.vm; @@ -3,7 +3,7 @@ package com.people.comment.comment.vm;
3 import androidx.lifecycle.LifecycleOwner; 3 import androidx.lifecycle.LifecycleOwner;
4 import com.people.comment.comment.listener.IVisitorCommentDataListener; 4 import com.people.comment.comment.listener.IVisitorCommentDataListener;
5 import com.people.comment.comment.model.VisitorCommentDataFetcher; 5 import com.people.comment.comment.model.VisitorCommentDataFetcher;
6 -import com.wd.common.UIViewModel; 6 +import com.wd.foundation.wdkit.mvvm.vm.UIViewModel;
7 7
8 /** 8 /**
9 * 游客评论vm 9 * 游客评论vm
1 -package com.wd.capability.layout.ui.commonpage; 1 +package com.people.comment.commonpage;
2 2
3 import android.text.TextUtils; 3 import android.text.TextUtils;
4 4
5 import androidx.annotation.NonNull; 5 import androidx.annotation.NonNull;
6 6
7 7
8 -import com.wd.common.constant.PageNameConstants; 8 +import com.wd.foundation.wdkit.constant.PageNameConstants;
9 import com.wd.foundation.bean.convenience.AskItemBean; 9 import com.wd.foundation.bean.convenience.AskItemBean;
10 import com.wd.foundation.bean.custom.act.BaseActivityBean; 10 import com.wd.foundation.bean.custom.act.BaseActivityBean;
11 import com.wd.foundation.bean.custom.comp.AudioBean; 11 import com.wd.foundation.bean.custom.comp.AudioBean;
1 -package com.wd.capability.layout.ui.commonpage; 1 +package com.people.comment.commonpage;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 import android.text.TextUtils; 4 import android.text.TextUtils;
5 5
  6 +import com.people.comment.fragment.TemplateFragment;
6 import com.people.room.SubscribeLivingHelper; 7 import com.people.room.SubscribeLivingHelper;
7 import com.people.room.entity.SubscribeLivingModel; 8 import com.people.room.entity.SubscribeLivingModel;
8 import com.wd.capability.layout.R; 9 import com.wd.capability.layout.R;
9 -import com.wd.capability.layout.fragment.TemplateFragment;  
10 import com.wd.capability.network.BaseObserver; 10 import com.wd.capability.network.BaseObserver;
11 import com.wd.capability.network.constant.ParameterConstant; 11 import com.wd.capability.network.constant.ParameterConstant;
12 import com.wd.capability.network.response.BaseResponse; 12 import com.wd.capability.network.response.BaseResponse;
13 import com.wd.common.api.RequestApi; 13 import com.wd.common.api.RequestApi;
14 -import com.wd.common.constant.PageNameConstants; 14 +import com.wd.foundation.wdkit.constant.PageNameConstants;
15 import com.wd.common.utils.CommonNetUtils; 15 import com.wd.common.utils.CommonNetUtils;
16 -import com.wd.common.utils.PDUtils; 16 +import com.wd.foundation.wdkit.utils.PDUtils;
17 import com.wd.common.utils.WorksDataHelper; 17 import com.wd.common.utils.WorksDataHelper;
18 import com.wd.foundation.bean.RecListBean; 18 import com.wd.foundation.bean.RecListBean;
19 import com.wd.foundation.bean.analytics.LiveTypeConstants; 19 import com.wd.foundation.bean.analytics.LiveTypeConstants;
1 -package com.wd.capability.layout.ui.commonpage; 1 +package com.people.comment.commonpage;
2 2
3 import com.wd.capability.layout.comp.layoutdata.Page; 3 import com.wd.capability.layout.comp.layoutdata.Page;
4 import com.wd.foundation.bean.custom.comp.PageBean; 4 import com.wd.foundation.bean.custom.comp.PageBean;
1 -package com.wd.capability.layout.ui.commonpage; 1 +package com.people.comment.commonpage;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 4
1 -package com.wd.capability.layout.ui.commonpage; 1 +package com.people.comment.commonpage;
2 2
3 import com.people.room.entity.ChannelBean; 3 import com.people.room.entity.ChannelBean;
4 import com.wd.capability.layout.comp.layoutdata.AbsGroup; 4 import com.wd.capability.layout.comp.layoutdata.AbsGroup;
5 import com.wd.capability.layout.comp.layoutdata.Page; 5 import com.wd.capability.layout.comp.layoutdata.Page;
6 import com.wd.capability.layout.comp.parser.ChannelSectionParser; 6 import com.wd.capability.layout.comp.parser.ChannelSectionParser;
  7 +import com.wd.capability.layout.ui.follow.listener.BatchCallback;
7 import com.wd.capability.layout.uitls.CompentLogicUtil; 8 import com.wd.capability.layout.uitls.CompentLogicUtil;
8 import com.wd.capability.network.fetcher.BaseDataFetcher; 9 import com.wd.capability.network.fetcher.BaseDataFetcher;
9 import com.wd.common.api.RequestApi; 10 import com.wd.common.api.RequestApi;
10 import com.wd.common.fetcher.InteractionStatusDataFetcher; 11 import com.wd.common.fetcher.InteractionStatusDataFetcher;
11 -import com.wd.common.listener.BatchCallback;  
12 -import com.wd.common.utils.PDUtils; 12 +import com.wd.foundation.wdkit.utils.PDUtils;
13 import com.wd.foundation.bean.comment.DisplayWorkInfoBean; 13 import com.wd.foundation.bean.comment.DisplayWorkInfoBean;
14 import com.wd.foundation.bean.custom.comp.CompBean; 14 import com.wd.foundation.bean.custom.comp.CompBean;
15 import com.wd.foundation.bean.custom.comp.GoldenPositionExtraBean; 15 import com.wd.foundation.bean.custom.comp.GoldenPositionExtraBean;
1 package com.people.comment.dialog; 1 package com.people.comment.dialog;
2 2
3 import android.app.Activity; 3 import android.app.Activity;
4 -import android.content.pm.ActivityInfo;  
5 import android.graphics.Color; 4 import android.graphics.Color;
6 import android.graphics.drawable.ColorDrawable; 5 import android.graphics.drawable.ColorDrawable;
7 import android.os.Bundle; 6 import android.os.Bundle;
@@ -18,10 +17,9 @@ import androidx.core.content.ContextCompat; @@ -18,10 +17,9 @@ import androidx.core.content.ContextCompat;
18 import com.people.comment.R; 17 import com.people.comment.R;
19 import com.people.comment.listener.CommitDialogListener; 18 import com.people.comment.listener.CommitDialogListener;
20 import com.people.comment.manager.ExpressionManager; 19 import com.people.comment.manager.ExpressionManager;
21 -import com.people.comment.utils.KeyboardHelper;  
22 -import com.wd.common.constant.PageNameConstants; 20 +import com.wd.foundation.wdkit.constant.PageNameConstants;
23 import com.wd.common.dialog.LayerDialog; 21 import com.wd.common.dialog.LayerDialog;
24 -import com.wd.common.imageglide.ImageUtils; 22 +import com.wd.foundation.wdkit.imageglide.ImageUtils;
25 import com.wd.common.permissions.IPmsCallBack; 23 import com.wd.common.permissions.IPmsCallBack;
26 import com.wd.common.permissions.PermissionsUtils; 24 import com.wd.common.permissions.PermissionsUtils;
27 import com.wd.common.widget.edittext.AutoAdaptTextSize; 25 import com.wd.common.widget.edittext.AutoAdaptTextSize;
@@ -40,7 +38,6 @@ import org.greenrobot.eventbus.Subscribe; @@ -40,7 +38,6 @@ import org.greenrobot.eventbus.Subscribe;
40 import org.greenrobot.eventbus.ThreadMode; 38 import org.greenrobot.eventbus.ThreadMode;
41 39
42 import java.util.ArrayList; 40 import java.util.ArrayList;
43 -import java.util.EnumSet;  
44 import java.util.List; 41 import java.util.List;
45 42
46 /** 43 /**
@@ -26,20 +26,18 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout; @@ -26,20 +26,18 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout;
26 import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener; 26 import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;
27 import com.wd.base.log.Logger; 27 import com.wd.base.log.Logger;
28 import com.wd.capability.network.BaseObserver; 28 import com.wd.capability.network.BaseObserver;
29 -import com.wd.capability.network.constant.EventConstants; 29 +import com.wd.foundation.wdkit.constant.EventConstants;
30 import com.wd.capability.network.response.ExceptionHandle; 30 import com.wd.capability.network.response.ExceptionHandle;
31 -import com.wd.common.constant.RegionNameConstants;  
32 -import com.wd.common.dialog.AlertDialog; 31 +import com.wd.foundation.wdkit.dialog.AlertDialog;
33 import com.wd.common.enums.MoreEnum; 32 import com.wd.common.enums.MoreEnum;
34 import com.wd.common.enums.PosterTypeEnum; 33 import com.wd.common.enums.PosterTypeEnum;
35 import com.wd.common.progress.PageLoadingView; 34 import com.wd.common.progress.PageLoadingView;
36 import com.wd.common.utils.CommonNetUtils; 35 import com.wd.common.utils.CommonNetUtils;
37 -import com.wd.common.utils.PDUtils; 36 +import com.wd.foundation.wdkit.utils.PDUtils;
38 import com.wd.common.utils.ProcessUtils; 37 import com.wd.common.utils.ProcessUtils;
39 import com.wd.common.widget.BottomCommentFunctionBar; 38 import com.wd.common.widget.BottomCommentFunctionBar;
40 -import com.wd.common.widget.CommomLoadMoreFooter;  
41 -import com.wd.common.widget.CustomSmartRefreshLayout;  
42 -import com.wd.foundation.bean.analytics.TrackContentBean; 39 +import com.wd.foundation.wdkit.view.CommomLoadMoreFooter;
  40 +import com.wd.foundation.wdkit.view.CustomSmartRefreshLayout;
43 import com.wd.foundation.bean.comment.CommentListBean; 41 import com.wd.foundation.bean.comment.CommentListBean;
44 import com.wd.foundation.bean.comment.CommentStatusBean; 42 import com.wd.foundation.bean.comment.CommentStatusBean;
45 import com.wd.foundation.bean.comment.TransparentBean; 43 import com.wd.foundation.bean.comment.TransparentBean;
@@ -29,7 +29,7 @@ import com.people.comment.bean.EmojiEntity; @@ -29,7 +29,7 @@ import com.people.comment.bean.EmojiEntity;
29 import com.people.comment.listener.CommentSeedListener; 29 import com.people.comment.listener.CommentSeedListener;
30 import com.wd.capability.network.BaseObserver; 30 import com.wd.capability.network.BaseObserver;
31 import com.wd.capability.network.bean.MetaBean; 31 import com.wd.capability.network.bean.MetaBean;
32 -import com.wd.capability.network.constant.EventConstants; 32 +import com.wd.foundation.wdkit.constant.EventConstants;
33 import com.wd.common.listener.SimpleTextWatcher; 33 import com.wd.common.listener.SimpleTextWatcher;
34 import com.wd.common.utils.CommonNetUtils; 34 import com.wd.common.utils.CommonNetUtils;
35 import com.wd.common.widget.InnerGridView; 35 import com.wd.common.widget.InnerGridView;
@@ -18,21 +18,20 @@ import com.people.comment.dialog.CommentCommitDialog; @@ -18,21 +18,20 @@ import com.people.comment.dialog.CommentCommitDialog;
18 import com.people.comment.listener.CommitDialogListener; 18 import com.people.comment.listener.CommitDialogListener;
19 import com.scwang.smart.refresh.layout.api.RefreshLayout; 19 import com.scwang.smart.refresh.layout.api.RefreshLayout;
20 import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener; 20 import com.scwang.smart.refresh.layout.listener.OnLoadMoreListener;
21 -import com.wd.capability.network.constant.EventConstants; 21 +import com.wd.foundation.wdkit.constant.EventConstants;
22 import com.wd.capability.network.response.ExceptionHandle; 22 import com.wd.capability.network.response.ExceptionHandle;
23 import com.wd.common.base.BaseActivity; 23 import com.wd.common.base.BaseActivity;
24 -import com.wd.common.base.BaseLazyFragment;  
25 -import com.wd.common.dialog.AlertDialog; 24 +import com.wd.foundation.wdkit.base.fragment.BaseLazyFragment;
  25 +import com.wd.foundation.wdkit.dialog.AlertDialog;
26 import com.wd.common.enums.MoreEnum; 26 import com.wd.common.enums.MoreEnum;
27 import com.wd.common.enums.PosterTypeEnum; 27 import com.wd.common.enums.PosterTypeEnum;
28 import com.wd.common.interact.ICommentDataNewListener; 28 import com.wd.common.interact.ICommentDataNewListener;
29 import com.wd.common.manager.WrapContentLinearLayoutManager; 29 import com.wd.common.manager.WrapContentLinearLayoutManager;
30 -import com.wd.common.utils.PDUtils; 30 +import com.wd.foundation.wdkit.utils.PDUtils;
31 import com.wd.common.utils.ProcessUtils; 31 import com.wd.common.utils.ProcessUtils;
32 -import com.wd.common.widget.CommomLoadMoreFooter;  
33 -import com.wd.common.widget.CustomSmartRefreshLayout; 32 +import com.wd.foundation.wdkit.view.CommomLoadMoreFooter;
  33 +import com.wd.foundation.wdkit.view.CustomSmartRefreshLayout;
34 import com.wd.foundation.bean.analytics.TraceBean; 34 import com.wd.foundation.bean.analytics.TraceBean;
35 -import com.wd.foundation.bean.analytics.TrackContentBean;  
36 import com.wd.foundation.bean.comment.CommentListBean; 35 import com.wd.foundation.bean.comment.CommentListBean;
37 import com.wd.foundation.bean.comment.CommentStatusBean; 36 import com.wd.foundation.bean.comment.CommentStatusBean;
38 import com.wd.foundation.bean.comment.TransparentBean; 37 import com.wd.foundation.bean.comment.TransparentBean;
1 -package com.wd.capability.layout.fragment; 1 +package com.people.comment.fragment;
2 2
3 import android.content.res.Configuration; 3 import android.content.res.Configuration;
4 import android.os.Bundle; 4 import android.os.Bundle;
@@ -18,15 +18,18 @@ import androidx.recyclerview.widget.GridLayoutManager; @@ -18,15 +18,18 @@ import androidx.recyclerview.widget.GridLayoutManager;
18 import androidx.recyclerview.widget.RecyclerView; 18 import androidx.recyclerview.widget.RecyclerView;
19 import androidx.recyclerview.widget.SimpleItemAnimator; 19 import androidx.recyclerview.widget.SimpleItemAnimator;
20 20
  21 +import com.people.comment.R;
21 import com.people.comment.bean.CommentClickShowType; 22 import com.people.comment.bean.CommentClickShowType;
22 import com.people.comment.comment.vm.CommentViewModel; 23 import com.people.comment.comment.vm.CommentViewModel;
  24 +import com.people.comment.commonpage.TemplatePageDataFetcher;
  25 +import com.people.comment.commonpage.TemplatePageDataListener;
  26 +import com.people.comment.commonpage.TemplatePageDataViewModel;
23 import com.people.comment.dialog.CommentCommitDialog; 27 import com.people.comment.dialog.CommentCommitDialog;
24 import com.people.comment.listener.CommitDialogListener; 28 import com.people.comment.listener.CommitDialogListener;
25 import com.people.room.entity.ChannelBean; 29 import com.people.room.entity.ChannelBean;
26 import com.scwang.smart.refresh.layout.api.RefreshLayout; 30 import com.scwang.smart.refresh.layout.api.RefreshLayout;
27 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener; 31 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
28 import com.wd.base.log.Logger; 32 import com.wd.base.log.Logger;
29 -import com.wd.capability.layout.R;  
30 import com.wd.capability.layout.comp.layoutdata.AbsGroup; 33 import com.wd.capability.layout.comp.layoutdata.AbsGroup;
31 import com.wd.capability.layout.comp.layoutdata.AbsSection; 34 import com.wd.capability.layout.comp.layoutdata.AbsSection;
32 import com.wd.capability.layout.comp.layoutdata.Group; 35 import com.wd.capability.layout.comp.layoutdata.Group;
@@ -38,30 +41,27 @@ import com.wd.capability.layout.comp.layoutmanager.LayoutAdapter; @@ -38,30 +41,27 @@ import com.wd.capability.layout.comp.layoutmanager.LayoutAdapter;
38 import com.wd.capability.layout.comp.layoutmanager.channel.CompBeSimilarMore; 41 import com.wd.capability.layout.comp.layoutmanager.channel.CompBeSimilarMore;
39 import com.wd.capability.layout.comp.layoutmanager.channel.CompLabel01; 42 import com.wd.capability.layout.comp.layoutmanager.channel.CompLabel01;
40 import com.wd.capability.layout.comp.layoutmanager.channel.CompSingleMessageBoard; 43 import com.wd.capability.layout.comp.layoutmanager.channel.CompSingleMessageBoard;
41 -import com.wd.capability.layout.ui.commonpage.TemplatePageDataFetcher;  
42 -import com.wd.capability.layout.ui.commonpage.TemplatePageDataListener;  
43 -import com.wd.capability.layout.ui.commonpage.TemplatePageDataViewModel;  
44 import com.wd.capability.layout.ui.widget.ColumnRecyclerView; 44 import com.wd.capability.layout.ui.widget.ColumnRecyclerView;
45 -import com.wd.capability.layout.ui.widget.VerticalLoadScrollListener;  
46 import com.wd.capability.layout.ui.widget.itemhelp.ItemStateChangeListener; 45 import com.wd.capability.layout.ui.widget.itemhelp.ItemStateChangeListener;
47 -import com.wd.capability.layout.ui.widget.progress.PageLoadingView;  
48 import com.wd.capability.layout.uitls.CompentLogicUtil; 46 import com.wd.capability.layout.uitls.CompentLogicUtil;
49 -import com.wd.capability.network.BaseObserver;  
50 -import com.wd.capability.network.bean.MetaBean;  
51 -import com.wd.capability.network.constant.EventConstants;  
52 -import com.wd.capability.network.utils.NetworkUtil;  
53 -import com.wd.common.base.BaseAutoLazyFragment;  
54 -import com.wd.common.decoration.Decoration; 47 +import com.wd.foundation.wdkit.dialog.AlertDialog;
55 import com.wd.common.enums.MoreEnum; 48 import com.wd.common.enums.MoreEnum;
56 import com.wd.common.interact.ICommentDataNewListener; 49 import com.wd.common.interact.ICommentDataNewListener;
  50 +import com.wd.common.interfaces.VerticalLoadScrollListener;
57 import com.wd.common.utils.CommonNetUtils; 51 import com.wd.common.utils.CommonNetUtils;
58 -import com.wd.common.utils.PDUtils; 52 +import com.wd.foundation.wdkit.utils.PDUtils;
59 import com.wd.common.utils.ProcessUtils; 53 import com.wd.common.utils.ProcessUtils;
60 -import com.wd.common.widget.CommomLoadMoreFooter;  
61 -import com.wd.common.widget.CommonRefreshHeader;  
62 -import com.wd.common.widget.CustomSmartRefreshLayout;  
63 -import com.wd.common.widget.DefaultView;  
64 -import com.wd.foundation.bean.analytics.TrackContentBean; 54 +import com.wd.foundation.wdkit.base.fragment.BaseAutoLazyFragment;
  55 +import com.wd.foundation.wdkit.decoration.Decoration;
  56 +import com.wd.foundation.wdkit.view.CommomLoadMoreFooter;
  57 +import com.wd.foundation.wdkit.view.CommonRefreshHeader;
  58 +import com.wd.foundation.wdkit.view.CustomSmartRefreshLayout;
  59 +import com.wd.foundation.wdkit.view.PageLoadingView;
  60 +import com.wd.capability.network.BaseObserver;
  61 +import com.wd.capability.network.bean.MetaBean;
  62 +import com.wd.foundation.wdkit.constant.EventConstants;
  63 +import com.wd.capability.network.utils.NetworkUtil;
  64 +import com.wd.foundation.wdkit.view.DefaultView;
65 import com.wd.foundation.bean.comment.CommentListBean; 65 import com.wd.foundation.bean.comment.CommentListBean;
66 import com.wd.foundation.bean.comment.CommentStatusBean; 66 import com.wd.foundation.bean.comment.CommentStatusBean;
67 import com.wd.foundation.bean.comment.TransparentBean; 67 import com.wd.foundation.bean.comment.TransparentBean;
@@ -92,7 +92,6 @@ import com.wd.foundation.wdkitcore.tools.ResUtils; @@ -92,7 +92,6 @@ import com.wd.foundation.wdkitcore.tools.ResUtils;
92 import com.wd.foundation.wdkitcore.tools.StringUtils; 92 import com.wd.foundation.wdkitcore.tools.StringUtils;
93 93
94 import org.jetbrains.annotations.NotNull; 94 import org.jetbrains.annotations.NotNull;
95 -import com.wd.common.dialog.AlertDialog;  
96 95
97 import java.util.ArrayList; 96 import java.util.ArrayList;
98 import java.util.List; 97 import java.util.List;
@@ -11,7 +11,7 @@ import com.people.comment.listener.CommentClickListener; @@ -11,7 +11,7 @@ import com.people.comment.listener.CommentClickListener;
11 import com.people.comment.view.easy_pop.EasyPopup; 11 import com.people.comment.view.easy_pop.EasyPopup;
12 import com.people.comment.view.easy_pop.XGravity; 12 import com.people.comment.view.easy_pop.XGravity;
13 import com.people.comment.view.easy_pop.YGravity; 13 import com.people.comment.view.easy_pop.YGravity;
14 -import com.wd.common.utils.PDUtils; 14 +import com.wd.foundation.wdkit.utils.PDUtils;
15 import com.wd.common.utils.ProcessUtils; 15 import com.wd.common.utils.ProcessUtils;
16 import com.wd.foundation.wdkitcore.tools.AppContext; 16 import com.wd.foundation.wdkitcore.tools.AppContext;
17 17
@@ -18,11 +18,11 @@ import androidx.recyclerview.widget.RecyclerView; @@ -18,11 +18,11 @@ import androidx.recyclerview.widget.RecyclerView;
18 18
19 import com.people.comment.R; 19 import com.people.comment.R;
20 import com.people.comment.adapter.CommentListAdapter; 20 import com.people.comment.adapter.CommentListAdapter;
21 -import com.wd.common.imageglide.ImageUtils;  
22 -import com.wd.common.utils.FontSettingUtil; 21 +import com.wd.foundation.wdkit.imageglide.ImageUtils;
  22 +import com.wd.foundation.wdkit.utils.FontSettingUtil;
23 import com.wd.common.utils.TimeTools; 23 import com.wd.common.utils.TimeTools;
24 -import com.wd.common.viewclick.BaseClickListener;  
25 -import com.wd.common.widget.ExpandableTextView; 24 +import com.wd.foundation.wdkit.viewclick.BaseClickListener;
  25 +import com.wd.foundation.wdkit.view.ExpandableTextView;
26 import com.wd.foundation.bean.custom.content.CommentItem; 26 import com.wd.foundation.bean.custom.content.CommentItem;
27 import com.wd.foundation.wdkit.utils.NumberStrUtils; 27 import com.wd.foundation.wdkit.utils.NumberStrUtils;
28 import com.wd.foundation.wdkit.utils.SpUtils; 28 import com.wd.foundation.wdkit.utils.SpUtils;
@@ -18,11 +18,11 @@ import androidx.recyclerview.widget.RecyclerView; @@ -18,11 +18,11 @@ import androidx.recyclerview.widget.RecyclerView;
18 18
19 import com.people.comment.R; 19 import com.people.comment.R;
20 import com.people.comment.adapter.CommentListAdapter; 20 import com.people.comment.adapter.CommentListAdapter;
21 -import com.wd.common.imageglide.ImageUtils;  
22 -import com.wd.common.utils.FontSettingUtil; 21 +import com.wd.foundation.wdkit.imageglide.ImageUtils;
  22 +import com.wd.foundation.wdkit.utils.FontSettingUtil;
23 import com.wd.common.utils.TimeTools; 23 import com.wd.common.utils.TimeTools;
24 -import com.wd.common.viewclick.BaseClickListener;  
25 -import com.wd.common.widget.ExpandableTextView; 24 +import com.wd.foundation.wdkit.viewclick.BaseClickListener;
  25 +import com.wd.foundation.wdkit.view.ExpandableTextView;
26 import com.wd.foundation.bean.custom.content.CommentItem; 26 import com.wd.foundation.bean.custom.content.CommentItem;
27 import com.wd.foundation.wdkit.utils.FilletUtil; 27 import com.wd.foundation.wdkit.utils.FilletUtil;
28 import com.wd.foundation.wdkit.utils.NumberStrUtils; 28 import com.wd.foundation.wdkit.utils.NumberStrUtils;
@@ -5,7 +5,7 @@ import android.view.View; @@ -5,7 +5,7 @@ import android.view.View;
5 import androidx.recyclerview.widget.RecyclerView; 5 import androidx.recyclerview.widget.RecyclerView;
6 6
7 import com.people.comment.R; 7 import com.people.comment.R;
8 -import com.wd.common.widget.DefaultView; 8 +import com.wd.foundation.wdkit.view.DefaultView;
9 import com.wd.foundation.wdkit.constant.DefaultViewConstant; 9 import com.wd.foundation.wdkit.constant.DefaultViewConstant;
10 10
11 /** 11 /**
@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView; @@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView;
9 9
10 import com.people.comment.R; 10 import com.people.comment.R;
11 import com.people.comment.adapter.CommentListAdapter; 11 import com.people.comment.adapter.CommentListAdapter;
12 -import com.wd.common.viewclick.BaseClickListener; 12 +import com.wd.foundation.wdkit.viewclick.BaseClickListener;
13 13
14 /** 14 /**
15 * @author ouyang 15 * @author ouyang
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 android:layout_weight="1" 65 android:layout_weight="1"
66 android:background="@color/res_color_common_C8"> 66 android:background="@color/res_color_common_C8">
67 67
68 - <com.wd.common.widget.CustomSmartRefreshLayout 68 + <com.wd.foundation.wdkit.view.CustomSmartRefreshLayout
69 android:id="@+id/data_SFL" 69 android:id="@+id/data_SFL"
70 android:layout_width="match_parent" 70 android:layout_width="match_parent"
71 android:layout_height="match_parent" 71 android:layout_height="match_parent"
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 android:layout_height="match_parent" 77 android:layout_height="match_parent"
78 android:scrollbars="none" /> 78 android:scrollbars="none" />
79 79
80 - </com.wd.common.widget.CustomSmartRefreshLayout> 80 + </com.wd.foundation.wdkit.view.CustomSmartRefreshLayout>
81 81
82 <com.wd.common.progress.PageLoadingView 82 <com.wd.common.progress.PageLoadingView
83 android:id="@+id/loading_view" 83 android:id="@+id/loading_view"
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 android:layout_height="match_parent" 4 android:layout_height="match_parent"
5 xmlns:app="http://schemas.android.com/apk/res-auto"> 5 xmlns:app="http://schemas.android.com/apk/res-auto">
6 6
7 - <com.wd.common.widget.CustomSmartRefreshLayout 7 + <com.wd.foundation.wdkit.view.CustomSmartRefreshLayout
8 android:id="@+id/layout_refresh" 8 android:id="@+id/layout_refresh"
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 android:layout_height="match_parent" 10 android:layout_height="match_parent"
@@ -19,6 +19,6 @@ @@ -19,6 +19,6 @@
19 android:background="@color/res_color_common_C8" 19 android:background="@color/res_color_common_C8"
20 android:overScrollMode="never"/> 20 android:overScrollMode="never"/>
21 21
22 - </com.wd.common.widget.CustomSmartRefreshLayout> 22 + </com.wd.foundation.wdkit.view.CustomSmartRefreshLayout>
23 23
24 </androidx.constraintlayout.widget.ConstraintLayout> 24 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -169,7 +169,7 @@ @@ -169,7 +169,7 @@
169 android:orientation="vertical"> 169 android:orientation="vertical">
170 170
171 <!--文字显示--> 171 <!--文字显示-->
172 - <com.wd.common.widget.ExpandableTextView 172 + <com.wd.foundation.wdkit.view.ExpandableTextView
173 android:id="@+id/content_ETV" 173 android:id="@+id/content_ETV"
174 android:layout_width="match_parent" 174 android:layout_width="match_parent"
175 android:layout_height="wrap_content" 175 android:layout_height="wrap_content"
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="@dimen/rmrb_dp300"> 5 android:layout_height="@dimen/rmrb_dp300">
6 6
7 - <com.wd.common.widget.DefaultView 7 + <com.wd.foundation.wdkit.view.DefaultView
8 android:id="@+id/defaultview" 8 android:id="@+id/defaultview"
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 android:layout_height="match_parent" /> 10 android:layout_height="match_parent" />
@@ -132,7 +132,7 @@ @@ -132,7 +132,7 @@
132 android:orientation="vertical"> 132 android:orientation="vertical">
133 133
134 <!--评论内容--> 134 <!--评论内容-->
135 - <com.wd.common.widget.ExpandableTextView 135 + <com.wd.foundation.wdkit.view.ExpandableTextView
136 android:id="@+id/content_ETV" 136 android:id="@+id/content_ETV"
137 android:layout_width="match_parent" 137 android:layout_width="match_parent"
138 android:layout_height="wrap_content" 138 android:layout_height="wrap_content"
@@ -117,7 +117,7 @@ @@ -117,7 +117,7 @@
117 117
118 </androidx.constraintlayout.widget.ConstraintLayout> 118 </androidx.constraintlayout.widget.ConstraintLayout>
119 119
120 - <com.wd.common.widget.ExpandableTextView 120 + <com.wd.foundation.wdkit.view.ExpandableTextView
121 android:id="@+id/tv_my_content" 121 android:id="@+id/tv_my_content"
122 android:layout_width="match_parent" 122 android:layout_width="match_parent"
123 android:layout_height="wrap_content" 123 android:layout_height="wrap_content"
@@ -160,7 +160,7 @@ @@ -160,7 +160,7 @@
160 android:paddingVertical="@dimen/rmrb_dp8" 160 android:paddingVertical="@dimen/rmrb_dp8"
161 app:layout_constraintTop_toBottomOf="@id/iv_my_comment"> 161 app:layout_constraintTop_toBottomOf="@id/iv_my_comment">
162 162
163 - <com.wd.common.widget.ExpandableTextView 163 + <com.wd.foundation.wdkit.view.ExpandableTextView
164 android:id="@+id/tv_original_comment_content" 164 android:id="@+id/tv_original_comment_content"
165 android:layout_width="match_parent" 165 android:layout_width="match_parent"
166 android:layout_height="wrap_content" 166 android:layout_height="wrap_content"
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 android:background="@color/res_color_common_C8" 8 android:background="@color/res_color_common_C8"
9 tools:background="@color/res_color_common_C12"> 9 tools:background="@color/res_color_common_C12">
10 10
11 - <com.wd.common.widget.ExpandableTextView 11 + <com.wd.foundation.wdkit.view.ExpandableTextView
12 android:id="@+id/tv_my_content" 12 android:id="@+id/tv_my_content"
13 android:layout_width="match_parent" 13 android:layout_width="match_parent"
14 android:layout_height="wrap_content" 14 android:layout_height="wrap_content"
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 app:layout_constraintBottom_toBottomOf="parent" 52 app:layout_constraintBottom_toBottomOf="parent"
53 app:layout_constraintTop_toBottomOf="@id/iv_my_comment"> 53 app:layout_constraintTop_toBottomOf="@id/iv_my_comment">
54 54
55 - <com.wd.common.widget.ExpandableTextView 55 + <com.wd.foundation.wdkit.view.ExpandableTextView
56 android:id="@+id/tv_original_comment_content" 56 android:id="@+id/tv_original_comment_content"
57 android:layout_width="match_parent" 57 android:layout_width="match_parent"
58 android:layout_height="wrap_content" 58 android:layout_height="wrap_content"
@@ -45,14 +45,13 @@ import com.people.basemusic.utils.AdaptScreenUtils; @@ -45,14 +45,13 @@ import com.people.basemusic.utils.AdaptScreenUtils;
45 import com.people.basemusic.utils.TimeUtils; 45 import com.people.basemusic.utils.TimeUtils;
46 import com.wd.base.log.Logger; 46 import com.wd.base.log.Logger;
47 import com.wd.capability.network.utils.NetworkUtil; 47 import com.wd.capability.network.utils.NetworkUtil;
48 -import com.wd.common.base.BaseApplication; 48 +import com.wd.foundation.wdkit.base.BaseApplication;
49 import com.wd.common.floatingview.FloatWindow; 49 import com.wd.common.floatingview.FloatWindow;
50 import com.wd.common.floatingview.IFloatingView; 50 import com.wd.common.floatingview.IFloatingView;
51 import com.wd.common.utils.ProcessUtils; 51 import com.wd.common.utils.ProcessUtils;
52 -import com.wd.common.viewclick.BaseClickListener; 52 +import com.wd.foundation.wdkit.viewclick.BaseClickListener;
53 import com.wd.common.widget.ForbidDragSeekBar; 53 import com.wd.common.widget.ForbidDragSeekBar;
54 import com.wd.common.widget.MarqueeNormalTextView; 54 import com.wd.common.widget.MarqueeNormalTextView;
55 -import com.wd.foundation.bean.analytics.ActionConstants;  
56 import com.wd.foundation.bean.analytics.TrackContentBean; 55 import com.wd.foundation.bean.analytics.TrackContentBean;
57 import com.wd.foundation.bean.music.bean.VoicePlayerBean; 56 import com.wd.foundation.bean.music.bean.VoicePlayerBean;
58 import com.wd.foundation.bean.music.bean.base.BaseAlbumItem; 57 import com.wd.foundation.bean.music.bean.base.BaseAlbumItem;
@@ -9,7 +9,7 @@ import androidx.annotation.NonNull; @@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
9 import androidx.lifecycle.DefaultLifecycleObserver; 9 import androidx.lifecycle.DefaultLifecycleObserver;
10 import androidx.lifecycle.LifecycleOwner; 10 import androidx.lifecycle.LifecycleOwner;
11 11
12 -import com.wd.common.base.BaseApplication; 12 +import com.wd.foundation.wdkit.base.BaseApplication;
13 13
14 14
15 /** 15 /**
@@ -35,7 +35,7 @@ import com.kunminx.architecture.ui.page.DataBindingActivity; @@ -35,7 +35,7 @@ import com.kunminx.architecture.ui.page.DataBindingActivity;
35 import com.wd.base.log.Logger; 35 import com.wd.base.log.Logger;
36 import com.wd.capability.router.data.ActionBean; 36 import com.wd.capability.router.data.ActionBean;
37 import com.wd.capability.router.data.RouterParameter; 37 import com.wd.capability.router.data.RouterParameter;
38 -import com.wd.common.base.BaseApplication; 38 +import com.wd.foundation.wdkit.base.BaseApplication;
39 import com.wd.common.floatingview.FloatWindow; 39 import com.wd.common.floatingview.FloatWindow;
40 import com.people.basemusic.response.manager.NetworkStateManager; 40 import com.people.basemusic.response.manager.NetworkStateManager;
41 import com.people.basemusic.utils.AdaptScreenUtils; 41 import com.people.basemusic.utils.AdaptScreenUtils;
@@ -29,7 +29,7 @@ import androidx.navigation.NavController; @@ -29,7 +29,7 @@ import androidx.navigation.NavController;
29 import androidx.navigation.fragment.NavHostFragment; 29 import androidx.navigation.fragment.NavHostFragment;
30 30
31 import com.kunminx.architecture.ui.page.DataBindingFragment; 31 import com.kunminx.architecture.ui.page.DataBindingFragment;
32 -import com.wd.common.base.BaseApplication; 32 +import com.wd.foundation.wdkit.base.BaseApplication;
33 33
34 34
35 /** 35 /**
@@ -6,7 +6,7 @@ import android.util.DisplayMetrics; @@ -6,7 +6,7 @@ import android.util.DisplayMetrics;
6 import android.util.Log; 6 import android.util.Log;
7 7
8 8
9 -import com.wd.common.base.BaseApplication; 9 +import com.wd.foundation.wdkit.base.BaseApplication;
10 import com.wd.foundation.wdkit.utils.SpUtils; 10 import com.wd.foundation.wdkit.utils.SpUtils;
11 11
12 import java.lang.reflect.Field; 12 import java.lang.reflect.Field;
@@ -25,7 +25,7 @@ import androidx.annotation.RequiresPermission; @@ -25,7 +25,7 @@ import androidx.annotation.RequiresPermission;
25 import androidx.appcompat.app.AppCompatActivity; 25 import androidx.appcompat.app.AppCompatActivity;
26 import androidx.drawerlayout.widget.DrawerLayout; 26 import androidx.drawerlayout.widget.DrawerLayout;
27 27
28 -import com.wd.common.base.BaseApplication; 28 +import com.wd.foundation.wdkit.base.BaseApplication;
29 29
30 import java.lang.reflect.Method; 30 import java.lang.reflect.Method;
31 31
@@ -8,7 +8,7 @@ import android.net.NetworkInfo; @@ -8,7 +8,7 @@ import android.net.NetworkInfo;
8 8
9 import androidx.annotation.RequiresPermission; 9 import androidx.annotation.RequiresPermission;
10 10
11 -import com.wd.common.base.BaseApplication; 11 +import com.wd.foundation.wdkit.base.BaseApplication;
12 12
13 /** 13 /**
14 * <pre> 14 * <pre>
@@ -28,8 +28,8 @@ import com.people.webview.ui.ArticleDetailActivity; @@ -28,8 +28,8 @@ import com.people.webview.ui.ArticleDetailActivity;
28 import com.people.webview.util.WebDataUtils; 28 import com.people.webview.util.WebDataUtils;
29 import com.people.webview.util.WebUtils; 29 import com.people.webview.util.WebUtils;
30 import com.wd.base.log.Logger; 30 import com.wd.base.log.Logger;
31 -import com.wd.common.base.BaseApplication;  
32 -import com.wd.common.dialog.AlertDialog; 31 +import com.wd.foundation.wdkit.base.BaseApplication;
  32 +import com.wd.foundation.wdkit.dialog.AlertDialog;
33 import com.wd.common.utils.ProcessUtils; 33 import com.wd.common.utils.ProcessUtils;
34 import com.wd.foundation.bean.JsAppInnerLinkBean; 34 import com.wd.foundation.bean.JsAppInnerLinkBean;
35 import com.wd.foundation.bean.JsCallAppBean; 35 import com.wd.foundation.bean.JsCallAppBean;
@@ -14,7 +14,6 @@ import android.view.ViewGroup; @@ -14,7 +14,6 @@ import android.view.ViewGroup;
14 import android.view.ViewParent; 14 import android.view.ViewParent;
15 import android.webkit.SslErrorHandler; 15 import android.webkit.SslErrorHandler;
16 import android.webkit.WebChromeClient; 16 import android.webkit.WebChromeClient;
17 -import android.webkit.WebResourceRequest;  
18 import android.webkit.WebSettings; 17 import android.webkit.WebSettings;
19 import android.webkit.WebView; 18 import android.webkit.WebView;
20 import android.webkit.WebViewClient; 19 import android.webkit.WebViewClient;
@@ -28,8 +27,8 @@ import com.wd.capability.network.utils.NetworkUtil; @@ -28,8 +27,8 @@ import com.wd.capability.network.utils.NetworkUtil;
28 import com.wd.capability.router.data.ActionBean; 27 import com.wd.capability.router.data.ActionBean;
29 import com.wd.common.base.BaseActivity; 28 import com.wd.common.base.BaseActivity;
30 import com.wd.common.constant.RouterConstants; 29 import com.wd.common.constant.RouterConstants;
31 -import com.wd.common.widget.CustomTitleBar;  
32 -import com.wd.common.widget.DefaultView; 30 +import com.wd.foundation.wdkit.view.CustomTitleBar;
  31 +import com.wd.foundation.wdkit.view.DefaultView;
33 import com.wd.foundation.wdkit.constant.DefaultViewConstant; 32 import com.wd.foundation.wdkit.constant.DefaultViewConstant;
34 import com.wd.foundation.wdkit.constant.IntentConstants; 33 import com.wd.foundation.wdkit.constant.IntentConstants;
35 import com.wd.foundation.wdkit.constant.ProtocolConstant; 34 import com.wd.foundation.wdkit.constant.ProtocolConstant;
@@ -42,18 +42,18 @@ import com.people.webview.vm.IArticleDetailDataListener; @@ -42,18 +42,18 @@ import com.people.webview.vm.IArticleDetailDataListener;
42 import com.scwang.smart.refresh.layout.api.RefreshLayout; 42 import com.scwang.smart.refresh.layout.api.RefreshLayout;
43 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener; 43 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
44 import com.wd.base.log.Logger; 44 import com.wd.base.log.Logger;
45 -import com.wd.capability.layout.fragment.RecommendFragment;  
46 -import com.wd.capability.network.constant.EventConstants; 45 +import com.people.webview.ui.fragment.RecommendFragment;
  46 +import com.wd.foundation.wdkit.constant.EventConstants;
47 import com.wd.capability.network.constant.ParameterConstant; 47 import com.wd.capability.network.constant.ParameterConstant;
48 import com.wd.capability.network.utils.NetworkUtil; 48 import com.wd.capability.network.utils.NetworkUtil;
49 import com.wd.capability.router.data.ActionBean; 49 import com.wd.capability.router.data.ActionBean;
50 import com.wd.common.base.BaseActivity; 50 import com.wd.common.base.BaseActivity;
51 -import com.wd.common.constant.PageNameConstants; 51 +import com.wd.foundation.wdkit.constant.PageNameConstants;
52 import com.wd.common.constant.RouterConstants; 52 import com.wd.common.constant.RouterConstants;
53 -import com.wd.common.dialog.EasterEggsDialog;  
54 -import com.wd.common.dialog.PopUpsUtils; 53 +import com.wd.foundation.wdkit.dialog.EasterEggsDialog;
  54 +import com.wd.foundation.wdkit.dialog.PopUpsUtils;
55 import com.wd.common.floatingview.FloatWindow; 55 import com.wd.common.floatingview.FloatWindow;
56 -import com.wd.common.imageglide.ImageUtils; 56 +import com.wd.foundation.wdkit.imageglide.ImageUtils;
57 import com.wd.common.incentive.constants.TaskOperateTypeConstants; 57 import com.wd.common.incentive.constants.TaskOperateTypeConstants;
58 import com.wd.common.incentive.task.TaskManager; 58 import com.wd.common.incentive.task.TaskManager;
59 import com.wd.common.interact.collect.CollectTools; 59 import com.wd.common.interact.collect.CollectTools;
@@ -69,12 +69,12 @@ import com.wd.common.net.NetStateChangeReceiver; @@ -69,12 +69,12 @@ import com.wd.common.net.NetStateChangeReceiver;
69 import com.wd.common.utils.CommonVarUtils; 69 import com.wd.common.utils.CommonVarUtils;
70 import com.wd.common.utils.HistoryDataHelper; 70 import com.wd.common.utils.HistoryDataHelper;
71 import com.wd.common.utils.MyShareUtils; 71 import com.wd.common.utils.MyShareUtils;
72 -import com.wd.common.utils.PDUtils; 72 +import com.wd.foundation.wdkit.utils.PDUtils;
73 import com.wd.common.utils.ProcessUtils; 73 import com.wd.common.utils.ProcessUtils;
74 import com.wd.common.utils.ToolsUtil; 74 import com.wd.common.utils.ToolsUtil;
75 import com.wd.common.utils.WorksDataHelper; 75 import com.wd.common.utils.WorksDataHelper;
76 -import com.wd.common.widget.CommonRefreshHeader;  
77 -import com.wd.common.widget.CustomSmartRefreshLayout; 76 +import com.wd.foundation.wdkit.view.CommonRefreshHeader;
  77 +import com.wd.foundation.wdkit.view.CustomSmartRefreshLayout;
78 import com.wd.foundation.bean.JsCallAppBean; 78 import com.wd.foundation.bean.JsCallAppBean;
79 import com.wd.foundation.bean.JsShareBean; 79 import com.wd.foundation.bean.JsShareBean;
80 import com.wd.foundation.bean.RecListBean; 80 import com.wd.foundation.bean.RecListBean;
@@ -41,7 +41,7 @@ import com.people.webview.util.WebUtils; @@ -41,7 +41,7 @@ import com.people.webview.util.WebUtils;
41 import com.people.webview.vm.ArticleDetailViewModel; 41 import com.people.webview.vm.ArticleDetailViewModel;
42 import com.people.webview.vm.IArticleDetailDataListener; 42 import com.people.webview.vm.IArticleDetailDataListener;
43 import com.wd.base.log.Logger; 43 import com.wd.base.log.Logger;
44 -import com.wd.capability.network.constant.EventConstants; 44 +import com.wd.foundation.wdkit.constant.EventConstants;
45 import com.wd.capability.network.utils.NetworkUtil; 45 import com.wd.capability.network.utils.NetworkUtil;
46 import com.wd.capability.router.data.ActionBean; 46 import com.wd.capability.router.data.ActionBean;
47 import com.wd.common.base.BaseActivity; 47 import com.wd.common.base.BaseActivity;
@@ -55,10 +55,10 @@ import com.wd.common.interact.interacts.callback.INewInteractDataListener; @@ -55,10 +55,10 @@ import com.wd.common.interact.interacts.callback.INewInteractDataListener;
55 import com.wd.common.interact.interacts.fetcher.InteractDataFetcher; 55 import com.wd.common.interact.interacts.fetcher.InteractDataFetcher;
56 import com.wd.common.utils.H5JsApiPermissionUtil; 56 import com.wd.common.utils.H5JsApiPermissionUtil;
57 import com.wd.common.utils.HistoryDataHelper; 57 import com.wd.common.utils.HistoryDataHelper;
58 -import com.wd.common.utils.PDUtils; 58 +import com.wd.foundation.wdkit.utils.PDUtils;
59 import com.wd.common.utils.ProcessUtils; 59 import com.wd.common.utils.ProcessUtils;
60 import com.wd.common.widget.BottomCommentFunctionBar; 60 import com.wd.common.widget.BottomCommentFunctionBar;
61 -import com.wd.common.widget.DefaultView; 61 +import com.wd.foundation.wdkit.view.DefaultView;
62 import com.wd.common.widget.MarqueeNormalTextView; 62 import com.wd.common.widget.MarqueeNormalTextView;
63 import com.wd.foundation.bean.JsCallAppBean; 63 import com.wd.foundation.bean.JsCallAppBean;
64 import com.wd.foundation.bean.JsImageBean; 64 import com.wd.foundation.bean.JsImageBean;
@@ -16,7 +16,7 @@ import com.aliyun.player.source.UrlSource; @@ -16,7 +16,7 @@ import com.aliyun.player.source.UrlSource;
16 import com.people.webview.R; 16 import com.people.webview.R;
17 import com.people.webview.listener.ChangeScreenListener; 17 import com.people.webview.listener.ChangeScreenListener;
18 import com.people.webview.listener.ArticleVideoListener; 18 import com.people.webview.listener.ArticleVideoListener;
19 -import com.wd.common.base.BaseFragment; 19 +import com.wd.foundation.wdkit.base.fragment.BaseFragment;
20 import com.wd.foundation.bean.web.ArticleVideoBean; 20 import com.wd.foundation.bean.web.ArticleVideoBean;
21 import com.wd.foundation.wdkit.constant.IntentConstants; 21 import com.wd.foundation.wdkit.constant.IntentConstants;
22 import com.wd.foundation.wdkit.system.DeviceUtil; 22 import com.wd.foundation.wdkit.system.DeviceUtil;
@@ -43,7 +43,7 @@ import com.people.webview.util.WebUtils; @@ -43,7 +43,7 @@ import com.people.webview.util.WebUtils;
43 import com.people.webview.vm.ArticleDetailViewModel; 43 import com.people.webview.vm.ArticleDetailViewModel;
44 import com.people.webview.vm.IArticleDetailDataListener; 44 import com.people.webview.vm.IArticleDetailDataListener;
45 import com.wd.base.log.Logger; 45 import com.wd.base.log.Logger;
46 -import com.wd.capability.network.constant.EventConstants; 46 +import com.wd.foundation.wdkit.constant.EventConstants;
47 import com.wd.capability.network.utils.NetworkUtil; 47 import com.wd.capability.network.utils.NetworkUtil;
48 import com.wd.capability.router.data.ActionBean; 48 import com.wd.capability.router.data.ActionBean;
49 import com.wd.common.base.BaseActivity; 49 import com.wd.common.base.BaseActivity;
@@ -53,7 +53,7 @@ import com.wd.common.permissions.IPmsCallBack; @@ -53,7 +53,7 @@ import com.wd.common.permissions.IPmsCallBack;
53 import com.wd.common.permissions.PermissionsUtils; 53 import com.wd.common.permissions.PermissionsUtils;
54 import com.wd.common.utils.H5JsApiPermissionUtil; 54 import com.wd.common.utils.H5JsApiPermissionUtil;
55 import com.wd.common.utils.ProcessUtils; 55 import com.wd.common.utils.ProcessUtils;
56 -import com.wd.common.widget.DefaultView; 56 +import com.wd.foundation.wdkit.view.DefaultView;
57 import com.wd.common.widget.MarqueeNormalTextView; 57 import com.wd.common.widget.MarqueeNormalTextView;
58 import com.wd.foundation.bean.JsCallAppBean; 58 import com.wd.foundation.bean.JsCallAppBean;
59 import com.wd.foundation.bean.JsImageBean; 59 import com.wd.foundation.bean.JsImageBean;
@@ -48,27 +48,27 @@ import com.people.webview.vm.IArticleDetailDataListener; @@ -48,27 +48,27 @@ import com.people.webview.vm.IArticleDetailDataListener;
48 import com.scwang.smart.refresh.layout.api.RefreshLayout; 48 import com.scwang.smart.refresh.layout.api.RefreshLayout;
49 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener; 49 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
50 import com.wd.base.log.Logger; 50 import com.wd.base.log.Logger;
51 -import com.wd.capability.network.constant.EventConstants; 51 +import com.wd.foundation.wdkit.constant.EventConstants;
52 import com.wd.capability.network.utils.NetworkUtil; 52 import com.wd.capability.network.utils.NetworkUtil;
53 import com.wd.capability.router.data.ActionBean; 53 import com.wd.capability.router.data.ActionBean;
54 -import com.wd.common.adv.CornerAdvLogic; 54 +import com.wd.foundation.wdkit.adv.CornerAdvLogic;
55 import com.wd.common.base.BaseActivity; 55 import com.wd.common.base.BaseActivity;
56 -import com.wd.common.constant.PageNameConstants; 56 +import com.wd.foundation.wdkit.constant.PageNameConstants;
57 import com.wd.common.constant.RouterConstants; 57 import com.wd.common.constant.RouterConstants;
58 -import com.wd.common.dialog.EasterEggsDialog;  
59 -import com.wd.common.dialog.PopUpsUtils; 58 +import com.wd.foundation.wdkit.dialog.EasterEggsDialog;
  59 +import com.wd.foundation.wdkit.dialog.PopUpsUtils;
60 import com.wd.common.enums.PosterTypeEnum; 60 import com.wd.common.enums.PosterTypeEnum;
61 import com.wd.common.interact.ICommentDataNewListener; 61 import com.wd.common.interact.ICommentDataNewListener;
62 import com.wd.common.listener.AddFavoriteLabelCallback; 62 import com.wd.common.listener.AddFavoriteLabelCallback;
63 import com.wd.common.net.NetStateChangeReceiver; 63 import com.wd.common.net.NetStateChangeReceiver;
64 import com.wd.common.utils.H5JsApiPermissionUtil; 64 import com.wd.common.utils.H5JsApiPermissionUtil;
65 import com.wd.common.utils.HistoryDataHelper; 65 import com.wd.common.utils.HistoryDataHelper;
66 -import com.wd.common.utils.PDUtils; 66 +import com.wd.foundation.wdkit.utils.PDUtils;
67 import com.wd.common.utils.ProcessUtils; 67 import com.wd.common.utils.ProcessUtils;
68 import com.wd.common.widget.BottomCommentFunctionBar; 68 import com.wd.common.widget.BottomCommentFunctionBar;
69 -import com.wd.common.widget.CommonRefreshHeader;  
70 -import com.wd.common.widget.CustomSmartRefreshLayout;  
71 -import com.wd.common.widget.DefaultView; 69 +import com.wd.foundation.wdkit.view.CommonRefreshHeader;
  70 +import com.wd.foundation.wdkit.view.CustomSmartRefreshLayout;
  71 +import com.wd.foundation.wdkit.view.DefaultView;
72 import com.wd.foundation.bean.JsCallAppBean; 72 import com.wd.foundation.bean.JsCallAppBean;
73 import com.wd.foundation.bean.JsImageBean; 73 import com.wd.foundation.bean.JsImageBean;
74 import com.wd.foundation.bean.JsScrollBean; 74 import com.wd.foundation.bean.JsScrollBean;
@@ -21,7 +21,7 @@ import androidx.annotation.Nullable; @@ -21,7 +21,7 @@ import androidx.annotation.Nullable;
21 import com.google.gson.Gson; 21 import com.google.gson.Gson;
22 import com.people.webview.javabridge.BridgeJavascriptInterface; 22 import com.people.webview.javabridge.BridgeJavascriptInterface;
23 import com.wd.base.log.Logger; 23 import com.wd.base.log.Logger;
24 -import com.wd.common.base.BaseApplication; 24 +import com.wd.foundation.wdkit.base.BaseApplication;
25 import com.wd.foundation.wdkit.system.DeviceUtil; 25 import com.wd.foundation.wdkit.system.DeviceUtil;
26 import com.wd.foundation.wdkit.utils.SpUtils; 26 import com.wd.foundation.wdkit.utils.SpUtils;
27 import com.wd.foundation.wdkitcore.tools.AppContext; 27 import com.wd.foundation.wdkitcore.tools.AppContext;
1 -package com.wd.capability.layout.fragment; 1 +package com.people.webview.ui.fragment;
2 2
3 import android.content.res.Configuration; 3 import android.content.res.Configuration;
4 import android.os.Bundle; 4 import android.os.Bundle;
@@ -14,27 +14,27 @@ import androidx.recyclerview.widget.GridLayoutManager; @@ -14,27 +14,27 @@ import androidx.recyclerview.widget.GridLayoutManager;
14 import androidx.recyclerview.widget.RecyclerView; 14 import androidx.recyclerview.widget.RecyclerView;
15 import androidx.recyclerview.widget.SimpleItemAnimator; 15 import androidx.recyclerview.widget.SimpleItemAnimator;
16 16
  17 +import com.people.comment.commonpage.TemplatePageDataFetcher;
  18 +import com.people.comment.commonpage.TemplatePageDataListener;
  19 +import com.people.comment.commonpage.TemplatePageDataViewModel;
17 import com.wd.capability.layout.R; 20 import com.wd.capability.layout.R;
18 import com.wd.capability.layout.comp.layoutdata.Page; 21 import com.wd.capability.layout.comp.layoutdata.Page;
19 import com.wd.capability.layout.comp.layoutmanager.BaseAdapter; 22 import com.wd.capability.layout.comp.layoutmanager.BaseAdapter;
20 import com.wd.capability.layout.comp.layoutmanager.ILayoutRender; 23 import com.wd.capability.layout.comp.layoutmanager.ILayoutRender;
21 import com.wd.capability.layout.comp.layoutmanager.ItemLayoutManager; 24 import com.wd.capability.layout.comp.layoutmanager.ItemLayoutManager;
22 import com.wd.capability.layout.comp.layoutmanager.LayoutAdapter; 25 import com.wd.capability.layout.comp.layoutmanager.LayoutAdapter;
23 -import com.wd.capability.layout.ui.commonpage.TemplatePageDataFetcher;  
24 -import com.wd.capability.layout.ui.commonpage.TemplatePageDataListener;  
25 -import com.wd.capability.layout.ui.commonpage.TemplatePageDataViewModel;  
26 import com.wd.capability.layout.ui.widget.ColumnRecyclerView; 26 import com.wd.capability.layout.ui.widget.ColumnRecyclerView;
27 import com.wd.capability.layout.ui.widget.itemhelp.ItemStateChangeListener; 27 import com.wd.capability.layout.ui.widget.itemhelp.ItemStateChangeListener;
28 import com.wd.capability.layout.uitls.CompentLogicUtil; 28 import com.wd.capability.layout.uitls.CompentLogicUtil;
29 -import com.wd.capability.network.constant.EventConstants;  
30 -import com.wd.common.base.BaseLazyFragment;  
31 -import com.wd.common.decoration.Decoration; 29 +import com.wd.foundation.wdkit.base.fragment.BaseLazyFragment;
  30 +import com.wd.foundation.wdkit.constant.EventConstants;
32 import com.wd.foundation.bean.RecListBean; 31 import com.wd.foundation.bean.RecListBean;
33 import com.wd.foundation.bean.custom.MenuBean; 32 import com.wd.foundation.bean.custom.MenuBean;
34 import com.wd.foundation.bean.custom.comp.CompDataSourceBean; 33 import com.wd.foundation.bean.custom.comp.CompDataSourceBean;
35 import com.wd.foundation.bean.custom.comp.PageBean; 34 import com.wd.foundation.bean.custom.comp.PageBean;
36 import com.wd.foundation.bean.livedate.EventMessage; 35 import com.wd.foundation.bean.livedate.EventMessage;
37 import com.wd.foundation.wdkit.constant.IntentConstants; 36 import com.wd.foundation.wdkit.constant.IntentConstants;
  37 +import com.wd.foundation.wdkit.decoration.Decoration;
38 import com.wd.foundation.wdkit.utils.SafeBundleUtil; 38 import com.wd.foundation.wdkit.utils.SafeBundleUtil;
39 import com.wd.foundation.wdkitcore.livedata.LiveDataBus; 39 import com.wd.foundation.wdkitcore.livedata.LiveDataBus;
40 import com.wd.foundation.wdkitcore.tools.StringUtils; 40 import com.wd.foundation.wdkitcore.tools.StringUtils;
1 package com.people.webview.util; 1 package com.people.webview.util;
2 2
3 -import com.wd.common.constant.PageNameConstants; 3 +import com.wd.foundation.wdkit.constant.PageNameConstants;
4 import com.wd.foundation.bean.analytics.TraceBean; 4 import com.wd.foundation.bean.analytics.TraceBean;
5 import com.wd.foundation.bean.analytics.TrackContentBean; 5 import com.wd.foundation.bean.analytics.TrackContentBean;
6 import com.wd.foundation.bean.custom.content.ContentTypeConstant; 6 import com.wd.foundation.bean.custom.content.ContentTypeConstant;
@@ -28,7 +28,7 @@ import com.wd.common.permissions.IPmsCallBack; @@ -28,7 +28,7 @@ import com.wd.common.permissions.IPmsCallBack;
28 import com.wd.common.permissions.PermissionsUtils; 28 import com.wd.common.permissions.PermissionsUtils;
29 import com.wd.common.utils.CommonNetUtils; 29 import com.wd.common.utils.CommonNetUtils;
30 import com.wd.common.utils.ImageDownloadThread; 30 import com.wd.common.utils.ImageDownloadThread;
31 -import com.wd.common.utils.PDUtils; 31 +import com.wd.foundation.wdkit.utils.PDUtils;
32 import com.wd.common.utils.ProcessUtils; 32 import com.wd.common.utils.ProcessUtils;
33 import com.wd.foundation.bean.JsCallAppBean; 33 import com.wd.foundation.bean.JsCallAppBean;
34 import com.wd.foundation.bean.JsImageBean; 34 import com.wd.foundation.bean.JsImageBean;
1 1
2 package com.people.webview.vm; 2 package com.people.webview.vm;
3 3
4 -import com.wd.common.UIViewModel; 4 +import com.wd.foundation.wdkit.mvvm.vm.UIViewModel;
5 import com.people.webview.model.ArticleDetailFetcher; 5 import com.people.webview.model.ArticleDetailFetcher;
6 import org.json.JSONObject; 6 import org.json.JSONObject;
7 import androidx.lifecycle.LifecycleOwner; 7 import androidx.lifecycle.LifecycleOwner;
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 android:background="@color/res_color_common_C7"/> 31 android:background="@color/res_color_common_C7"/>
32 32
33 <!--缺省页面--> 33 <!--缺省页面-->
34 - <com.wd.common.widget.DefaultView 34 + <com.wd.foundation.wdkit.view.DefaultView
35 android:id="@+id/default_view" 35 android:id="@+id/default_view"
36 android:layout_width="match_parent" 36 android:layout_width="match_parent"
37 android:layout_height="0dp" 37 android:layout_height="0dp"
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 android:fitsSystemWindows="true" 6 android:fitsSystemWindows="true"
7 android:orientation="vertical"> 7 android:orientation="vertical">
8 8
9 - <com.wd.common.widget.CustomTitleBar 9 + <com.wd.foundation.wdkit.view.CustomTitleBar
10 android:id="@+id/title_bar" 10 android:id="@+id/title_bar"
11 android:layout_width="match_parent" 11 android:layout_width="match_parent"
12 android:layout_height="wrap_content" 12 android:layout_height="wrap_content"
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 android:layout_height="match_parent" /> 30 android:layout_height="match_parent" />
31 31
32 <!--缺省页面--> 32 <!--缺省页面-->
33 - <com.wd.common.widget.DefaultView 33 + <com.wd.foundation.wdkit.view.DefaultView
34 android:id="@+id/default_view" 34 android:id="@+id/default_view"
35 android:layout_width="match_parent" 35 android:layout_width="match_parent"
36 android:layout_height="match_parent" /> 36 android:layout_height="match_parent" />
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 android:layout_height="match_parent" 4 android:layout_height="match_parent"
5 xmlns:app="http://schemas.android.com/apk/res-auto"> 5 xmlns:app="http://schemas.android.com/apk/res-auto">
6 6
7 - <com.wd.common.widget.CustomSmartRefreshLayout 7 + <com.wd.foundation.wdkit.view.CustomSmartRefreshLayout
8 android:id="@+id/layout_refresh" 8 android:id="@+id/layout_refresh"
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 android:layout_height="match_parent" 10 android:layout_height="match_parent"
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 android:visibility="visible"> 28 android:visibility="visible">
29 29
30 <!--缺省页面--> 30 <!--缺省页面-->
31 - <com.wd.common.widget.DefaultView 31 + <com.wd.foundation.wdkit.view.DefaultView
32 android:id="@+id/default_view" 32 android:id="@+id/default_view"
33 android:layout_width="match_parent" 33 android:layout_width="match_parent"
34 android:layout_height="match_parent" 34 android:layout_height="match_parent"
@@ -66,6 +66,6 @@ @@ -66,6 +66,6 @@
66 66
67 </LinearLayout> 67 </LinearLayout>
68 68
69 - </com.wd.common.widget.CustomSmartRefreshLayout> 69 + </com.wd.foundation.wdkit.view.CustomSmartRefreshLayout>
70 70
71 </androidx.constraintlayout.widget.ConstraintLayout> 71 </androidx.constraintlayout.widget.ConstraintLayout>
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 app:layout_constraintTop_toBottomOf="@+id/rl_title" 62 app:layout_constraintTop_toBottomOf="@+id/rl_title"
63 app:layout_constraintVertical_weight="1"> 63 app:layout_constraintVertical_weight="1">
64 64
65 - <com.wd.common.widget.CustomSmartRefreshLayout 65 + <com.wd.foundation.wdkit.view.CustomSmartRefreshLayout
66 android:id="@+id/layout_refresh" 66 android:id="@+id/layout_refresh"
67 android:layout_width="match_parent" 67 android:layout_width="match_parent"
68 android:layout_height="match_parent" 68 android:layout_height="match_parent"
@@ -205,7 +205,7 @@ @@ -205,7 +205,7 @@
205 </androidx.constraintlayout.widget.ConstraintLayout> 205 </androidx.constraintlayout.widget.ConstraintLayout>
206 206
207 </androidx.core.widget.NestedScrollView> 207 </androidx.core.widget.NestedScrollView>
208 - </com.wd.common.widget.CustomSmartRefreshLayout> 208 + </com.wd.foundation.wdkit.view.CustomSmartRefreshLayout>
209 </LinearLayout> 209 </LinearLayout>
210 210
211 <View 211 <View
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 </LinearLayout> 66 </LinearLayout>
67 67
68 <!--缺省页面--> 68 <!--缺省页面-->
69 - <com.wd.common.widget.DefaultView 69 + <com.wd.foundation.wdkit.view.DefaultView
70 android:id="@+id/default_view" 70 android:id="@+id/default_view"
71 android:layout_width="match_parent" 71 android:layout_width="match_parent"
72 android:layout_height="0dp" 72 android:layout_height="0dp"
@@ -36,12 +36,12 @@ android { @@ -36,12 +36,12 @@ android {
36 } 36 }
37 37
38 dependencies { 38 dependencies {
39 - api fileTree(include: ['commons-lang3-3.0.jar'], dir: 'src/main/commonlibs')  
40 // 快马基础库 39 // 快马基础库
41 api project(path: ':wdrouter') 40 api project(path: ':wdrouter')
42 api project(path: ':wdlog') 41 api project(path: ':wdlog')
43 api project(path: ':wdkit') 42 api project(path: ':wdkit')
44 api project(path: ':wdnetwork') 43 api project(path: ':wdnetwork')
  44 + api project(path: ':wdlayout')
45 api project(path: ':lib_room') 45 api project(path: ':lib_room')
46 // 基础依赖库 46 // 基础依赖库
47 api 'com.alibaba:arouter-api:1.5.2' 47 api 'com.alibaba:arouter-api:1.5.2'
@@ -64,7 +64,6 @@ dependencies { @@ -64,7 +64,6 @@ dependencies {
64 // RecyclerView多功能适配器 64 // RecyclerView多功能适配器
65 api rootProject.ext.dependencies["BaseRecyclerViewAdapterHelper"] 65 api rootProject.ext.dependencies["BaseRecyclerViewAdapterHelper"]
66 66
67 - implementation rootProject.ext.dependencies["palette"]  
68 // 给布局设置阴影 67 // 给布局设置阴影
69 api rootProject.ext.dependencies["ShapeView"] 68 api rootProject.ext.dependencies["ShapeView"]
70 api rootProject.ext.dependencies["ShapeDrawable"] 69 api rootProject.ext.dependencies["ShapeDrawable"]
@@ -27,16 +27,17 @@ import com.wd.base.log.Logger; @@ -27,16 +27,17 @@ import com.wd.base.log.Logger;
27 import com.wd.capability.network.constant.NetConstant; 27 import com.wd.capability.network.constant.NetConstant;
28 import com.wd.capability.router.data.ActionBean; 28 import com.wd.capability.router.data.ActionBean;
29 import com.wd.capability.router.data.RouterParameter; 29 import com.wd.capability.router.data.RouterParameter;
30 -import com.wd.capability.network.constant.EventConstants;  
31 -import com.wd.common.dialog.DialogUtils; 30 +import com.wd.foundation.wdkit.constant.EventConstants;
  31 +import com.wd.foundation.wdkit.utils.DialogUtils;
32 import com.wd.common.dialog.FlowTooBigDialog; 32 import com.wd.common.dialog.FlowTooBigDialog;
33 import com.wd.common.permissions.IPmsCallBack; 33 import com.wd.common.permissions.IPmsCallBack;
34 import com.wd.common.permissions.PermissionsUtils; 34 import com.wd.common.permissions.PermissionsUtils;
35 import com.wd.common.utils.NotificationUtils; 35 import com.wd.common.utils.NotificationUtils;
36 import com.wd.common.utils.ProcessUtils; 36 import com.wd.common.utils.ProcessUtils;
37 import com.wd.common.utils.ToolsUtil; 37 import com.wd.common.utils.ToolsUtil;
38 -import com.wd.common.widget.CustomTitleBar;  
39 -import com.wd.common.widget.DefaultView; 38 +import com.wd.foundation.wdkit.view.CustomTitleBar;
  39 +import com.wd.foundation.wdkit.utils.StatusBarUtil;
  40 +import com.wd.foundation.wdkit.view.DefaultView;
40 import com.wd.fastcoding.base.R; 41 import com.wd.fastcoding.base.R;
41 import com.wd.foundation.bean.livedate.NetStateMessage; 42 import com.wd.foundation.bean.livedate.NetStateMessage;
42 import com.wd.foundation.wdkit.mvvm.base.BaseMvvmActivity; 43 import com.wd.foundation.wdkit.mvvm.base.BaseMvvmActivity;
@@ -304,7 +305,7 @@ public abstract class BaseActivity extends BaseMvvmActivity implements CustomTit @@ -304,7 +305,7 @@ public abstract class BaseActivity extends BaseMvvmActivity implements CustomTit
304 } 305 }
305 306
306 public void setStatusBarStyle(@NonNull StatusBarStyleEnum statusBarStyle) { 307 public void setStatusBarStyle(@NonNull StatusBarStyleEnum statusBarStyle) {
307 - ToolsUtil.setStatusBarStyle(statusBarStyle, this); 308 + StatusBarUtil.setStatusBarStyle(statusBarStyle, this);
308 } 309 }
309 310
310 /** 311 /**
@@ -14,7 +14,7 @@ import androidx.constraintlayout.widget.ConstraintLayout; @@ -14,7 +14,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
14 14
15 import com.airbnb.lottie.LottieAnimationView; 15 import com.airbnb.lottie.LottieAnimationView;
16 import com.wd.common.constant.UrlConstants; 16 import com.wd.common.constant.UrlConstants;
17 -import com.wd.common.utils.PDUtils; 17 +import com.wd.foundation.wdkit.utils.PDUtils;
18 import com.wd.common.utils.ProcessUtils; 18 import com.wd.common.utils.ProcessUtils;
19 import com.wd.fastcoding.base.R; 19 import com.wd.fastcoding.base.R;
20 import com.wd.foundation.bean.custom.content.ContentBean; 20 import com.wd.foundation.bean.custom.content.ContentBean;
@@ -13,8 +13,8 @@ import android.widget.ImageView; @@ -13,8 +13,8 @@ import android.widget.ImageView;
13 import android.widget.LinearLayout; 13 import android.widget.LinearLayout;
14 import android.widget.RelativeLayout; 14 import android.widget.RelativeLayout;
15 15
16 -import com.wd.common.imageglide.ImageUtils;  
17 -import com.wd.common.viewclick.BaseClickListener; 16 +import com.wd.foundation.wdkit.imageglide.ImageUtils;
  17 +import com.wd.foundation.wdkit.viewclick.BaseClickListener;
18 import com.wd.fastcoding.base.R; 18 import com.wd.fastcoding.base.R;
19 import com.wd.foundation.bean.response.CodeIdentifyBean; 19 import com.wd.foundation.bean.response.CodeIdentifyBean;
20 import com.wd.foundation.wdkit.animator.MyAnimationUtils; 20 import com.wd.foundation.wdkit.animator.MyAnimationUtils;
@@ -14,7 +14,7 @@ import android.widget.TextView; @@ -14,7 +14,7 @@ import android.widget.TextView;
14 import androidx.annotation.NonNull; 14 import androidx.annotation.NonNull;
15 import androidx.constraintlayout.widget.ConstraintLayout; 15 import androidx.constraintlayout.widget.ConstraintLayout;
16 16
17 -import com.wd.common.viewclick.BaseClickListener; 17 +import com.wd.foundation.wdkit.viewclick.BaseClickListener;
18 import com.wd.fastcoding.base.R; 18 import com.wd.fastcoding.base.R;
19 import com.wd.foundation.bean.utils.TimeUtil; 19 import com.wd.foundation.bean.utils.TimeUtil;
20 20
@@ -6,7 +6,7 @@ import com.wd.capability.network.fetcher.BaseDataFetcher; @@ -6,7 +6,7 @@ import com.wd.capability.network.fetcher.BaseDataFetcher;
6 import com.wd.capability.network.response.BaseResponse; 6 import com.wd.capability.network.response.BaseResponse;
7 import com.wd.common.api.RequestApi; 7 import com.wd.common.api.RequestApi;
8 import com.wd.common.listener.IHistoryDataListener; 8 import com.wd.common.listener.IHistoryDataListener;
9 -import com.wd.common.utils.PDUtils; 9 +import com.wd.foundation.wdkit.utils.PDUtils;
10 import com.wd.foundation.bean.request.HistoryAddBean; 10 import com.wd.foundation.bean.request.HistoryAddBean;
11 import com.wd.foundation.bean.request.SimpleContentBean; 11 import com.wd.foundation.bean.request.SimpleContentBean;
12 import com.wd.foundation.bean.utils.TimeUtil; 12 import com.wd.foundation.bean.utils.TimeUtil;
@@ -3,9 +3,9 @@ package com.wd.common.fetcher; @@ -3,9 +3,9 @@ package com.wd.common.fetcher;
3 import android.text.TextUtils; 3 import android.text.TextUtils;
4 4
5 5
6 -import com.wd.common.listener.BatchCallback; 6 +import com.wd.capability.layout.ui.follow.listener.BatchCallback;
7 import com.wd.common.listener.InteractionDataListener; 7 import com.wd.common.listener.InteractionDataListener;
8 -import com.wd.common.utils.PDUtils; 8 +import com.wd.foundation.wdkit.utils.PDUtils;
9 import com.wd.capability.network.BaseObserver; 9 import com.wd.capability.network.BaseObserver;
10 import com.wd.capability.network.constant.ParameterConstant; 10 import com.wd.capability.network.constant.ParameterConstant;
11 import com.wd.capability.network.fetcher.BaseDataFetcher; 11 import com.wd.capability.network.fetcher.BaseDataFetcher;
@@ -18,7 +18,7 @@ import androidx.core.view.ViewCompat; @@ -18,7 +18,7 @@ import androidx.core.view.ViewCompat;
18 18
19 import com.hjq.shape.builder.ShapeDrawableBuilder; 19 import com.hjq.shape.builder.ShapeDrawableBuilder;
20 import com.hjq.shape.layout.ShapeConstraintLayout; 20 import com.hjq.shape.layout.ShapeConstraintLayout;
21 -import com.wd.common.base.BaseApplication; 21 +import com.wd.foundation.wdkit.base.BaseApplication;
22 import com.wd.common.widget.ForbidDragSeekBar; 22 import com.wd.common.widget.ForbidDragSeekBar;
23 import com.wd.common.widget.MarqueeNormalTextView; 23 import com.wd.common.widget.MarqueeNormalTextView;
24 import com.wd.fastcoding.base.R; 24 import com.wd.fastcoding.base.R;
@@ -6,7 +6,7 @@ import android.os.Handler; @@ -6,7 +6,7 @@ import android.os.Handler;
6 import com.wd.capability.network.BaseObserver; 6 import com.wd.capability.network.BaseObserver;
7 import com.wd.common.incentive.constants.TaskNameConstants; 7 import com.wd.common.incentive.constants.TaskNameConstants;
8 import com.wd.common.incentive.constants.TaskOperateTypeConstants; 8 import com.wd.common.incentive.constants.TaskOperateTypeConstants;
9 -import com.wd.common.utils.PDUtils; 9 +import com.wd.foundation.wdkit.utils.PDUtils;
10 import com.wd.foundation.bean.TaskFinishBean; 10 import com.wd.foundation.bean.TaskFinishBean;
11 import com.wd.foundation.bean.incentive.PointLevelOperateBean; 11 import com.wd.foundation.bean.incentive.PointLevelOperateBean;
12 import com.wd.foundation.wdkit.constant.Constants; 12 import com.wd.foundation.wdkit.constant.Constants;
@@ -4,12 +4,11 @@ import android.content.Context; @@ -4,12 +4,11 @@ import android.content.Context;
4 import android.text.TextUtils; 4 import android.text.TextUtils;
5 5
6 6
7 -import com.wd.capability.network.constant.EventConstants; 7 +import com.wd.foundation.wdkit.constant.EventConstants;
8 import com.wd.capability.network.utils.NetworkUtil; 8 import com.wd.capability.network.utils.NetworkUtil;
9 import com.wd.common.interact.collect.callback.CollectCallback; 9 import com.wd.common.interact.collect.callback.CollectCallback;
10 import com.wd.common.interact.collect.model.UserCollectFetcher; 10 import com.wd.common.interact.collect.model.UserCollectFetcher;
11 import com.wd.common.listener.AddFavoriteLabelCallback; 11 import com.wd.common.listener.AddFavoriteLabelCallback;
12 -import com.wd.common.utils.ToolsUtil;  
13 import com.wd.fastcoding.base.R; 12 import com.wd.fastcoding.base.R;
14 import com.wd.foundation.bean.collect.CollectContentBean; 13 import com.wd.foundation.bean.collect.CollectContentBean;
15 import com.wd.foundation.bean.custom.collect.AddDelCollectBean; 14 import com.wd.foundation.bean.custom.collect.AddDelCollectBean;
@@ -80,8 +79,8 @@ public class CollectTools { @@ -80,8 +79,8 @@ public class CollectTools {
80 collectContentBean.contentRelId = listBean.getContentRelId(); 79 collectContentBean.contentRelId = listBean.getContentRelId();
81 contentList.add(collectContentBean); 80 contentList.add(collectContentBean);
82 } 81 }
83 - ToolsUtil.showAddCollectLabelDialog(context,contentList,  
84 - addFavoriteLabelCallback); 82 +// ToolsUtil.showAddCollectLabelDialog(context,contentList,
  83 +// addFavoriteLabelCallback);
85 } 84 }
86 85
87 if (ArrayUtils.isNotEmpty(inputContentList) && inputContentList.get(0) != null){ 86 if (ArrayUtils.isNotEmpty(inputContentList) && inputContentList.get(0) != null){
@@ -6,7 +6,7 @@ import android.text.TextUtils; @@ -6,7 +6,7 @@ import android.text.TextUtils;
6 import androidx.lifecycle.LifecycleOwner; 6 import androidx.lifecycle.LifecycleOwner;
7 7
8 import com.wd.capability.network.BaseObserver; 8 import com.wd.capability.network.BaseObserver;
9 -import com.wd.common.UIViewModel; 9 +import com.wd.foundation.wdkit.mvvm.vm.UIViewModel;
10 import com.wd.common.interact.collect.CollectTools; 10 import com.wd.common.interact.collect.CollectTools;
11 import com.wd.common.interact.collect.callback.CollectCallback; 11 import com.wd.common.interact.collect.callback.CollectCallback;
12 import com.wd.common.listener.AddFavoriteLabelCallback; 12 import com.wd.common.listener.AddFavoriteLabelCallback;
@@ -2,7 +2,7 @@ package com.wd.common.interact.collect.model; @@ -2,7 +2,7 @@ package com.wd.common.interact.collect.model;
2 2
3 import androidx.lifecycle.LifecycleOwner; 3 import androidx.lifecycle.LifecycleOwner;
4 4
5 -import com.wd.common.UIViewModel; 5 +import com.wd.foundation.wdkit.mvvm.vm.UIViewModel;
6 import com.wd.common.fetcher.InteractionStatusDataFetcher; 6 import com.wd.common.fetcher.InteractionStatusDataFetcher;
7 import com.wd.common.listener.InteractionDataListener; 7 import com.wd.common.listener.InteractionDataListener;
8 import com.wd.foundation.bean.custom.content.ContentBean; 8 import com.wd.foundation.bean.custom.content.ContentBean;
1 -package com.wd.common.interact.follow.listener;  
2 -  
3 -  
4 -import com.wd.foundation.bean.response.FollowListIndexBean;  
5 -import com.wd.foundation.wdkit.mvvm.vm.IVMCallback;  
6 -  
7 -/**  
8 - * @author : gta  
9 - * @description :  
10 - * @since : 2022/7/13  
11 - */  
12 -public interface FollowDataListener extends IVMCallback {  
13 -  
14 - /**  
15 - * 获取页面数据返回  
16 - *  
17 - */  
18 - void onGetDateSuccess(FollowListIndexBean mList);  
19 -  
20 - /**  
21 - * 成功一键关注  
22 - */  
23 - void oneKeySuccess();  
24 -  
25 - /**  
26 - * 获取页面数据失败返回  
27 - *  
28 - * @param type 失败  
29 - * @param error 错误信息  
30 - */  
31 - void onFailed(int type, String error);  
32 -  
33 -  
34 - /**  
35 - * 用户关注/取消关注接口  
36 - */  
37 - void onOperationSuccess();  
38 -  
39 - /**  
40 - * 用户关注/取消关注接口  
41 - */  
42 - void onOperationFailed(String error);  
43 -  
44 -}  
@@ -6,26 +6,24 @@ package com.wd.common.interact.follow.model; @@ -6,26 +6,24 @@ package com.wd.common.interact.follow.model;
6 6
7 import android.text.TextUtils; 7 import android.text.TextUtils;
8 8
9 - 9 +import com.wd.capability.layout.ui.follow.listener.FollowDataListener;
  10 +import com.wd.capability.layout.ui.follow.listener.GetBatchStatusListener;
  11 +import com.wd.capability.layout.ui.follow.listener.GetFollowStatusListener;
10 import com.wd.capability.network.BaseObserver; 12 import com.wd.capability.network.BaseObserver;
11 -import com.wd.capability.network.constant.EventConstants;  
12 import com.wd.capability.network.constant.ParameterConstant; 13 import com.wd.capability.network.constant.ParameterConstant;
13 import com.wd.capability.network.fetcher.BaseDataFetcher; 14 import com.wd.capability.network.fetcher.BaseDataFetcher;
14 import com.wd.capability.network.response.BaseResponse; 15 import com.wd.capability.network.response.BaseResponse;
15 import com.wd.common.api.RequestApi; 16 import com.wd.common.api.RequestApi;
16 -import com.wd.common.incentive.constants.TaskOperateTypeConstants;  
17 -import com.wd.common.incentive.task.TaskManager;  
18 -import com.wd.common.interact.follow.listener.FollowDataListener;  
19 -import com.wd.common.utils.PDUtils;  
20 import com.wd.fastcoding.base.R; 17 import com.wd.fastcoding.base.R;
21 import com.wd.foundation.bean.custom.content.PeopleMasterBean; 18 import com.wd.foundation.bean.custom.content.PeopleMasterBean;
22 import com.wd.foundation.bean.livedate.EventMessage; 19 import com.wd.foundation.bean.livedate.EventMessage;
23 import com.wd.foundation.bean.response.FollowBean; 20 import com.wd.foundation.bean.response.FollowBean;
24 import com.wd.foundation.bean.response.FollowListIndexBean; 21 import com.wd.foundation.bean.response.FollowListIndexBean;
25 import com.wd.foundation.bean.response.MasterFollowsStatusBean; 22 import com.wd.foundation.bean.response.MasterFollowsStatusBean;
  23 +import com.wd.foundation.wdkit.constant.EventConstants;
26 import com.wd.foundation.wdkit.constant.IntentConstants; 24 import com.wd.foundation.wdkit.constant.IntentConstants;
27 -import com.wd.foundation.wdkit.mvvm.vm.IVMCallback;  
28 import com.wd.foundation.wdkit.utils.CommonUtil; 25 import com.wd.foundation.wdkit.utils.CommonUtil;
  26 +import com.wd.foundation.wdkit.utils.PDUtils;
29 import com.wd.foundation.wdkit.utils.SpUtils; 27 import com.wd.foundation.wdkit.utils.SpUtils;
30 import com.wd.foundation.wdkit.utils.ToastNightUtil; 28 import com.wd.foundation.wdkit.utils.ToastNightUtil;
31 import com.wd.foundation.wdkitcore.livedata.LiveDataBus; 29 import com.wd.foundation.wdkitcore.livedata.LiveDataBus;
@@ -101,7 +99,7 @@ public class FollowDataFetcher extends BaseDataFetcher<RequestApi> { @@ -101,7 +99,7 @@ public class FollowDataFetcher extends BaseDataFetcher<RequestApi> {
101 public void onSuccess(String mData) { 99 public void onSuccess(String mData) {
102 if(status == 1){ 100 if(status == 1){
103 //执行任务：关注 101 //执行任务：关注
104 - TaskManager.getInstance().executePointLevelOperate(TaskOperateTypeConstants.FOLLOW); 102 +// TaskManager.getInstance().executePointLevelOperate(TaskOperateTypeConstants.FOLLOW);
105 } 103 }
106 if (mListener != null) { 104 if (mListener != null) {
107 mListener.onOperationSuccess(); 105 mListener.onOperationSuccess();
@@ -406,21 +404,4 @@ public class FollowDataFetcher extends BaseDataFetcher<RequestApi> { @@ -406,21 +404,4 @@ public class FollowDataFetcher extends BaseDataFetcher<RequestApi> {
406 } 404 }
407 405
408 406
409 - public interface GetFollowStatusListener extends IVMCallback {  
410 - /**  
411 - * 目的是关注状态列表接口  
412 - */  
413 - void onSuccess(MasterFollowsStatusBean mObj);  
414 -  
415 - }  
416 -  
417 - public interface GetBatchStatusListener extends IVMCallback {  
418 - /**  
419 - * 目的是关注状态列表接口  
420 - */  
421 - void onSuccess(List<MasterFollowsStatusBean> list);  
422 -  
423 - void error(String e);  
424 -  
425 - }  
426 } 407 }
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 * Copyright (c) Wondertek Technologies Co., Ltd. 2021-2022. All rights reserved. 2 * Copyright (c) Wondertek Technologies Co., Ltd. 2021-2022. All rights reserved.
3 */ 3 */
4 4
5 -package com.wd.capability.layout.ui.follow.model; 5 +package com.wd.common.interact.follow.model;
6 6
7 import android.text.TextUtils; 7 import android.text.TextUtils;
8 8
@@ -10,11 +10,10 @@ import android.text.TextUtils; @@ -10,11 +10,10 @@ import android.text.TextUtils;
10 import com.wd.capability.layout.comp.layoutdata.AbsGroup; 10 import com.wd.capability.layout.comp.layoutdata.AbsGroup;
11 import com.wd.capability.layout.comp.layoutdata.Page; 11 import com.wd.capability.layout.comp.layoutdata.Page;
12 import com.wd.capability.layout.comp.parser.ChannelSectionParser; 12 import com.wd.capability.layout.comp.parser.ChannelSectionParser;
13 -import com.wd.common.listener.BatchCallback; 13 +import com.wd.capability.layout.ui.follow.listener.BatchCallback;
14 import com.wd.capability.layout.ui.follow.listener.HomeFollowDataListener; 14 import com.wd.capability.layout.ui.follow.listener.HomeFollowDataListener;
15 import com.wd.capability.layout.uitls.CompentLogicUtil; 15 import com.wd.capability.layout.uitls.CompentLogicUtil;
16 import com.wd.common.fetcher.InteractionStatusDataFetcher; 16 import com.wd.common.fetcher.InteractionStatusDataFetcher;
17 -import com.wd.common.utils.PDUtils;  
18 import com.wd.capability.network.BaseObserver; 17 import com.wd.capability.network.BaseObserver;
19 import com.wd.capability.network.bean.MetaBean; 18 import com.wd.capability.network.bean.MetaBean;
20 import com.wd.capability.network.cachedata.CacheData; 19 import com.wd.capability.network.cachedata.CacheData;
@@ -41,6 +40,7 @@ import com.wd.foundation.bean.response.MasterFollowsStatusBean; @@ -41,6 +40,7 @@ import com.wd.foundation.bean.response.MasterFollowsStatusBean;
41 import com.wd.foundation.wdkit.json.GsonUtils; 40 import com.wd.foundation.wdkit.json.GsonUtils;
42 import com.wd.foundation.wdkit.mvvm.model.ConditionTask; 41 import com.wd.foundation.wdkit.mvvm.model.ConditionTask;
43 import com.wd.foundation.bean.utils.TimeUtil; 42 import com.wd.foundation.bean.utils.TimeUtil;
  43 +import com.wd.foundation.wdkit.utils.PDUtils;
44 import com.wd.foundation.wdkit.utils.ToastNightUtil; 44 import com.wd.foundation.wdkit.utils.ToastNightUtil;
45 import com.wd.foundation.wdkitcore.tools.HostUtil; 45 import com.wd.foundation.wdkitcore.tools.HostUtil;
46 import com.wd.foundation.wdkitcore.tools.StringUtils; 46 import com.wd.foundation.wdkitcore.tools.StringUtils;
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 * Copyright (c) Wondertek Technologies Co., Ltd. 2021-2022. All rights reserved. 3 * Copyright (c) Wondertek Technologies Co., Ltd. 2021-2022. All rights reserved.
4 */ 4 */
5 5
6 -package com.wd.capability.layout.ui.follow.model; 6 +package com.wd.common.interact.follow.model;
7 7
8 import com.wd.capability.layout.ui.follow.listener.LocalAskDataListener; 8 import com.wd.capability.layout.ui.follow.listener.LocalAskDataListener;
9 import com.wd.capability.network.BaseObserver; 9 import com.wd.capability.network.BaseObserver;
@@ -4,8 +4,10 @@ package com.wd.common.interact.follow.vm; @@ -4,8 +4,10 @@ package com.wd.common.interact.follow.vm;
4 import androidx.lifecycle.LifecycleOwner; 4 import androidx.lifecycle.LifecycleOwner;
5 5
6 6
7 -import com.wd.common.UIViewModel;  
8 -import com.wd.common.interact.follow.listener.FollowDataListener; 7 +import com.wd.capability.layout.ui.follow.listener.FollowDataListener;
  8 +import com.wd.capability.layout.ui.follow.listener.GetBatchStatusListener;
  9 +import com.wd.capability.layout.ui.follow.listener.GetFollowStatusListener;
  10 +import com.wd.foundation.wdkit.mvvm.vm.UIViewModel;
9 import com.wd.common.interact.follow.model.FollowDataFetcher; 11 import com.wd.common.interact.follow.model.FollowDataFetcher;
10 12
11 import java.util.List; 13 import java.util.List;
@@ -54,7 +56,7 @@ public class FollowViewModel extends UIViewModel { @@ -54,7 +56,7 @@ public class FollowViewModel extends UIViewModel {
54 /** 56 /**
55 * 批量查询创作者关注状态 57 * 批量查询创作者关注状态
56 */ 58 */
57 - public void getMasterStatusRequest(String creatorId, FollowDataFetcher.GetFollowStatusListener mGetFollowStatusListener){ 59 + public void getMasterStatusRequest(String creatorId, GetFollowStatusListener mGetFollowStatusListener){
58 if (mDataFetcher==null){ 60 if (mDataFetcher==null){
59 mDataFetcher = new FollowDataFetcher(mDataListener); 61 mDataFetcher = new FollowDataFetcher(mDataListener);
60 } 62 }
@@ -65,7 +67,7 @@ public class FollowViewModel extends UIViewModel { @@ -65,7 +67,7 @@ public class FollowViewModel extends UIViewModel {
65 /** 67 /**
66 * 批量查询创作者关注状态 68 * 批量查询创作者关注状态
67 */ 69 */
68 - public void getBatchStatusRequest(List<String> creatorIds, FollowDataFetcher.GetBatchStatusListener mGetBatchStatusListener){ 70 + public void getBatchStatusRequest(List<String> creatorIds, GetBatchStatusListener mGetBatchStatusListener){
69 if (mDataFetcher==null){ 71 if (mDataFetcher==null){
70 mDataFetcher = new FollowDataFetcher(mDataListener); 72 mDataFetcher = new FollowDataFetcher(mDataListener);
71 } 73 }
@@ -4,7 +4,7 @@ package com.wd.common.interact.interacts; @@ -4,7 +4,7 @@ package com.wd.common.interact.interacts;
4 4
5 import androidx.lifecycle.LifecycleOwner; 5 import androidx.lifecycle.LifecycleOwner;
6 6
7 -import com.wd.common.UIViewModel; 7 +import com.wd.foundation.wdkit.mvvm.vm.UIViewModel;
8 import com.wd.common.interact.interacts.callback.IInteractDataListener; 8 import com.wd.common.interact.interacts.callback.IInteractDataListener;
9 import com.wd.common.interact.interacts.callback.IInteractDataViewModel; 9 import com.wd.common.interact.interacts.callback.IInteractDataViewModel;
10 import com.wd.common.interact.interacts.fetcher.InteractFetcher; 10 import com.wd.common.interact.interacts.fetcher.InteractFetcher;
1 package com.wd.common.interact.like; 1 package com.wd.common.interact.like;
2 2
3 3
4 -import com.wd.capability.network.constant.EventConstants; 4 +import com.wd.foundation.wdkit.constant.EventConstants;
5 import com.wd.common.interact.like.callback.LikeCallback; 5 import com.wd.common.interact.like.callback.LikeCallback;
6 import com.wd.common.interact.like.model.UserLikeFetcher; 6 import com.wd.common.interact.like.model.UserLikeFetcher;
7 import com.wd.foundation.bean.livedate.EventMessage; 7 import com.wd.foundation.bean.livedate.EventMessage;
@@ -3,7 +3,7 @@ package com.wd.common.interact.like; @@ -3,7 +3,7 @@ package com.wd.common.interact.like;
3 3
4 import com.wd.common.interact.like.callback.QueryLikeStatusCallback; 4 import com.wd.common.interact.like.callback.QueryLikeStatusCallback;
5 import com.wd.common.interact.like.model.QueryLikeStatusFetcher; 5 import com.wd.common.interact.like.model.QueryLikeStatusFetcher;
6 -import com.wd.common.utils.PDUtils; 6 +import com.wd.foundation.wdkit.utils.PDUtils;
7 import com.wd.foundation.bean.comment.DisplayWorkInfoBean; 7 import com.wd.foundation.bean.comment.DisplayWorkInfoBean;
8 8
9 import java.lang.ref.WeakReference; 9 import java.lang.ref.WeakReference;
@@ -13,7 +13,7 @@ import com.wd.capability.network.BaseObserver; @@ -13,7 +13,7 @@ import com.wd.capability.network.BaseObserver;
13 import com.wd.capability.network.RetrofitClient; 13 import com.wd.capability.network.RetrofitClient;
14 import com.wd.capability.network.bean.MetaBean; 14 import com.wd.capability.network.bean.MetaBean;
15 import com.wd.capability.network.bean.TokenBean; 15 import com.wd.capability.network.bean.TokenBean;
16 -import com.wd.capability.network.constant.EventConstants; 16 +import com.wd.foundation.wdkit.constant.EventConstants;
17 import com.wd.capability.network.constant.NetConstant; 17 import com.wd.capability.network.constant.NetConstant;
18 import com.wd.capability.network.constant.ParameterConstant; 18 import com.wd.capability.network.constant.ParameterConstant;
19 import com.wd.capability.network.interceptor.LoggingInterceptor; 19 import com.wd.capability.network.interceptor.LoggingInterceptor;
@@ -9,7 +9,7 @@ import android.net.NetworkInfo; @@ -9,7 +9,7 @@ import android.net.NetworkInfo;
9 9
10 import com.wd.base.log.Logger; 10 import com.wd.base.log.Logger;
11 import com.wd.capability.network.constant.NetConstant; 11 import com.wd.capability.network.constant.NetConstant;
12 -import com.wd.capability.network.constant.EventConstants; 12 +import com.wd.foundation.wdkit.constant.EventConstants;
13 import com.wd.foundation.bean.livedate.NetStateMessage; 13 import com.wd.foundation.bean.livedate.NetStateMessage;
14 import com.wd.foundation.wdkitcore.livedata.LiveDataBus; 14 import com.wd.foundation.wdkitcore.livedata.LiveDataBus;
15 15
@@ -22,9 +22,9 @@ import androidx.annotation.NonNull; @@ -22,9 +22,9 @@ import androidx.annotation.NonNull;
22 import androidx.annotation.Nullable; 22 import androidx.annotation.Nullable;
23 import androidx.core.content.ContextCompat; 23 import androidx.core.content.ContextCompat;
24 24
25 -import com.wd.common.imageglide.ImageUtils;  
26 -import com.wd.common.viewclick.BaseClickListener;  
27 -import com.wd.common.widget.RoundRectImageView; 25 +import com.wd.foundation.wdkit.imageglide.ImageUtils;
  26 +import com.wd.foundation.wdkit.viewclick.BaseClickListener;
  27 +import com.wd.foundation.wdkit.view.RoundRectImageView;
28 import com.wd.fastcoding.base.R; 28 import com.wd.fastcoding.base.R;
29 import com.wd.foundation.wdkit.statusbar.StatusBarCompat; 29 import com.wd.foundation.wdkit.statusbar.StatusBarCompat;
30 import com.wd.foundation.bean.utils.TimeUtil; 30 import com.wd.foundation.bean.utils.TimeUtil;
@@ -6,12 +6,13 @@ import android.text.TextUtils; @@ -6,12 +6,13 @@ import android.text.TextUtils;
6 6
7 import com.alibaba.fastjson.JSONObject; 7 import com.alibaba.fastjson.JSONObject;
8 import com.wd.base.log.Logger; 8 import com.wd.base.log.Logger;
  9 +import com.wd.capability.layout.ui.follow.listener.GetFollowStatusListener;
9 import com.wd.capability.network.BaseObserver; 10 import com.wd.capability.network.BaseObserver;
10 import com.wd.capability.network.RetrofitClient; 11 import com.wd.capability.network.RetrofitClient;
11 import com.wd.capability.network.bean.MetaBean; 12 import com.wd.capability.network.bean.MetaBean;
12 import com.wd.capability.network.cachedata.CacheData; 13 import com.wd.capability.network.cachedata.CacheData;
13 import com.wd.capability.network.cachedata.CacheH5PageData; 14 import com.wd.capability.network.cachedata.CacheH5PageData;
14 -import com.wd.capability.network.constant.EventConstants; 15 +import com.wd.foundation.wdkit.constant.EventConstants;
15 import com.wd.capability.network.constant.ParameterConstant; 16 import com.wd.capability.network.constant.ParameterConstant;
16 import com.wd.capability.network.fetcher.BaseDataFetcher; 17 import com.wd.capability.network.fetcher.BaseDataFetcher;
17 import com.wd.capability.network.response.BaseResponse; 18 import com.wd.capability.network.response.BaseResponse;
@@ -66,6 +67,7 @@ import com.wd.foundation.bean.response.MasterFollowsStatusBean; @@ -66,6 +67,7 @@ import com.wd.foundation.bean.response.MasterFollowsStatusBean;
66 import com.wd.foundation.bean.response.MyAskMarkBean; 67 import com.wd.foundation.bean.response.MyAskMarkBean;
67 import com.wd.foundation.bean.response.NewsDetailBean; 68 import com.wd.foundation.bean.response.NewsDetailBean;
68 import com.wd.foundation.bean.response.PersonalInfoBean; 69 import com.wd.foundation.bean.response.PersonalInfoBean;
  70 +import com.wd.foundation.wdkit.utils.PDUtils;
69 import com.wd.foundation.wdkitcore.constant.BaseConstants; 71 import com.wd.foundation.wdkitcore.constant.BaseConstants;
70 import com.wd.foundation.wdkit.constant.IntentConstants; 72 import com.wd.foundation.wdkit.constant.IntentConstants;
71 import com.wd.foundation.wdkit.file.MyFileUtils; 73 import com.wd.foundation.wdkit.file.MyFileUtils;
@@ -757,7 +759,7 @@ public class CommonNetUtils extends BaseDataFetcher<RequestApi> { @@ -757,7 +759,7 @@ public class CommonNetUtils extends BaseDataFetcher<RequestApi> {
757 /** 759 /**
758 * 查询单个创作者关注状态 760 * 查询单个创作者关注状态
759 */ 761 */
760 - public void getMasterStatusRequest(String creatorId, FollowDataFetcher.GetFollowStatusListener mGetFollowStatusListener) { 762 + public void getMasterStatusRequest(String creatorId, GetFollowStatusListener mGetFollowStatusListener) {
761 //未登录不需调用 763 //未登录不需调用
762 if (TextUtils.isEmpty(SpUtils.getUserToken())) { 764 if (TextUtils.isEmpty(SpUtils.getUserToken())) {
763 return; 765 return;
@@ -14,6 +14,7 @@ import com.wd.foundation.bean.request.SimpleContentBean; @@ -14,6 +14,7 @@ import com.wd.foundation.bean.request.SimpleContentBean;
14 import com.wd.foundation.bean.response.NewsDetailBean; 14 import com.wd.foundation.bean.response.NewsDetailBean;
15 import com.wd.foundation.wdkit.json.GsonUtils; 15 import com.wd.foundation.wdkit.json.GsonUtils;
16 import com.wd.foundation.bean.utils.TimeUtil; 16 import com.wd.foundation.bean.utils.TimeUtil;
  17 +import com.wd.foundation.wdkit.utils.PDUtils;
17 import com.wd.foundation.wdkitcore.thread.ThreadPoolUtils; 18 import com.wd.foundation.wdkitcore.thread.ThreadPoolUtils;
18 import com.wd.foundation.wdkitcore.tools.AppContext; 19 import com.wd.foundation.wdkitcore.tools.AppContext;
19 import com.wd.foundation.wdkitcore.tools.StringUtils; 20 import com.wd.foundation.wdkitcore.tools.StringUtils;
@@ -9,11 +9,10 @@ import android.text.TextUtils; @@ -9,11 +9,10 @@ import android.text.TextUtils;
9 9
10 import com.google.gson.JsonObject; 10 import com.google.gson.JsonObject;
11 import com.wd.base.log.Logger; 11 import com.wd.base.log.Logger;
12 -import com.wd.capability.network.constant.EventConstants;  
13 import com.wd.capability.router.WdRouterRule; 12 import com.wd.capability.router.WdRouterRule;
14 import com.wd.capability.router.data.ActionBean; 13 import com.wd.capability.router.data.ActionBean;
15 -import com.wd.common.base.BaseApplication;  
16 -import com.wd.common.constant.PageNameConstants; 14 +import com.wd.foundation.wdkit.constant.PageNameConstants;
  15 +import com.wd.common.constant.RouterConstants;
17 import com.wd.common.manager.AudioThemManager; 16 import com.wd.common.manager.AudioThemManager;
18 import com.wd.fastcoding.base.R; 17 import com.wd.fastcoding.base.R;
19 import com.wd.foundation.bean.custom.MenuBean; 18 import com.wd.foundation.bean.custom.MenuBean;
@@ -24,10 +23,11 @@ import com.wd.foundation.bean.custom.comp.ChannelInfoBean; @@ -24,10 +23,11 @@ import com.wd.foundation.bean.custom.comp.ChannelInfoBean;
24 import com.wd.foundation.bean.custom.video.VodDetailIntentBean; 23 import com.wd.foundation.bean.custom.video.VodDetailIntentBean;
25 import com.wd.foundation.bean.music.bean.VoicePlayerBean; 24 import com.wd.foundation.bean.music.bean.VoicePlayerBean;
26 import com.wd.foundation.bean.paper.PaperPageItemBean; 25 import com.wd.foundation.bean.paper.PaperPageItemBean;
  26 +import com.wd.foundation.wdkit.base.BaseApplication;
  27 +import com.wd.foundation.wdkit.constant.EventConstants;
27 import com.wd.foundation.wdkit.constant.GloadLogicParams; 28 import com.wd.foundation.wdkit.constant.GloadLogicParams;
28 import com.wd.foundation.wdkit.constant.IntentConstants; 29 import com.wd.foundation.wdkit.constant.IntentConstants;
29 -import com.wd.common.constant.RouterConstants;  
30 -import com.wd.common.imageglide.ImageUtils; 30 +import com.wd.foundation.wdkit.imageglide.ImageUtils;
31 import com.wd.foundation.bean.custom.comp.CompBean; 31 import com.wd.foundation.bean.custom.comp.CompBean;
32 import com.wd.foundation.bean.custom.comp.CompDataSourceBean; 32 import com.wd.foundation.bean.custom.comp.CompDataSourceBean;
33 import com.wd.foundation.bean.custom.content.ContentBean; 33 import com.wd.foundation.bean.custom.content.ContentBean;
@@ -30,7 +30,6 @@ import com.wd.foundation.wdkit.file.MyFileUtils; @@ -30,7 +30,6 @@ import com.wd.foundation.wdkit.file.MyFileUtils;
30 import com.wd.foundation.wdkit.perloader.DeviceHelper; 30 import com.wd.foundation.wdkit.perloader.DeviceHelper;
31 import com.wd.foundation.wdkit.statusbar.StatusBarCompat; 31 import com.wd.foundation.wdkit.statusbar.StatusBarCompat;
32 import com.wd.foundation.wdkit.statusbar.StatusBarStyleEnum; 32 import com.wd.foundation.wdkit.statusbar.StatusBarStyleEnum;
33 -import com.wd.foundation.wdkitcore.tools.AppContext;  
34 import com.wd.foundation.wdkitcore.tools.ResUtils; 33 import com.wd.foundation.wdkitcore.tools.ResUtils;
35 import com.yalantis.ucrop.UCrop; 34 import com.yalantis.ucrop.UCrop;
36 35
@@ -450,55 +449,6 @@ public class ToolsUtil { @@ -450,55 +449,6 @@ public class ToolsUtil {
450 // 449 //
451 // } 450 // }
452 451
453 - public static void setStatusBarStyle(@NonNull StatusBarStyleEnum statusBarStyle, int navigatonBarBgColor, Activity activity) {  
454 - if (statusBarStyle.isFullScreen()) {  
455 -  
456 - if (-1 == statusBarStyle.getColorId()) {  
457 - // 全屏，即，沉浸式状态栏。需要自己处理好页面内容，因为部分内容会顶到状态栏底部  
458 - StatusBarCompat.fullScreenNoStatusBar(activity, navigatonBarBgColor);  
459 - } else {  
460 - // 全屏，即，沉浸式状态栏。需要自己处理好页面内容，因为部分内容会顶到状态栏底部  
461 - StatusBarCompat.fullScreenStatusBar(activity, Color.TRANSPARENT, navigatonBarBgColor, statusBarStyle.isLabelIsBlack());  
462 - }  
463 -  
464 - } else {  
465 - // 修改状态栏背景色，非全屏  
466 - int state = statusBarStyle.isLabelIsBlack() ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR  
467 - : View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;  
468 - StatusBarCompat.setStatusBar(activity, state, statusBarStyle.getColorId());  
469 - }  
470 - }  
471 -  
472 -  
473 - public static void setStatusBarStyle(@NonNull StatusBarStyleEnum statusBarStyle, Activity activity) {  
474 - if(activity == null){  
475 - return;  
476 - }  
477 - // 获取底部导航栏背景色  
478 - int navigatonBarBgColor = ContextCompat.getColor(activity,R.color.res_color_common_C8);  
479 - if (activity instanceof StatusBarCompat.NavigationBarInterface){  
480 - navigatonBarBgColor = ((StatusBarCompat.NavigationBarInterface)activity).getNavigationBarBgColor();  
481 - }  
482 - if (statusBarStyle.isFullScreen()) {  
483 - if (-1 == statusBarStyle.getColorId()) {  
484 - // 全屏，即，沉浸式状态栏。需要自己处理好页面内容，因为部分内容会顶到状态栏底部  
485 - StatusBarCompat.fullScreenNoStatusBar(activity, navigatonBarBgColor);  
486 - } else {  
487 - // 全屏，即，沉浸式状态栏。需要自己处理好页面内容，因为部分内容会顶到状态栏底部  
488 - StatusBarCompat.fullScreenStatusBar(activity, Color.TRANSPARENT, navigatonBarBgColor, statusBarStyle.isLabelIsBlack());  
489 - }  
490 -  
491 - } else {  
492 - // 修改状态栏背景色，非全屏  
493 - int state = statusBarStyle.isLabelIsBlack() ? View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR  
494 - : View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;  
495 - StatusBarCompat.setStatusBar(activity, state, statusBarStyle.getColorId(),navigatonBarBgColor);  
496 - if(DeviceHelper.isMIUI()){  
497 - StatusBarCompat.setMiuiStatusBarDarkMode(statusBarStyle.isLabelIsBlack(),activity);  
498 - }  
499 - }  
500 - }  
501 -  
502 /** 452 /**
503 * 直播间点赞样式数据转换，给横屏直播和竖屏直播使用 453 * 直播间点赞样式数据转换，给横屏直播和竖屏直播使用
504 * 454 *
@@ -2,7 +2,7 @@ package com.wd.common.utils; @@ -2,7 +2,7 @@ package com.wd.common.utils;
2 2
3 3
4 4
5 -import com.wd.common.constant.PageNameConstants; 5 +import com.wd.foundation.wdkit.constant.PageNameConstants;
6 import com.wd.foundation.bean.custom.NavigationBeanNews; 6 import com.wd.foundation.bean.custom.NavigationBeanNews;
7 import com.wd.foundation.bean.custom.comp.ContainerItemBean; 7 import com.wd.foundation.bean.custom.comp.ContainerItemBean;
8 import com.wd.foundation.bean.custom.content.ContentBean; 8 import com.wd.foundation.bean.custom.content.ContentBean;
@@ -18,7 +18,7 @@ import android.widget.LinearLayout; @@ -18,7 +18,7 @@ import android.widget.LinearLayout;
18 import androidx.annotation.NonNull; 18 import androidx.annotation.NonNull;
19 import androidx.annotation.Nullable; 19 import androidx.annotation.Nullable;
20 20
21 -import com.wd.common.dialog.DialogUtils; 21 +import com.wd.foundation.wdkit.utils.DialogUtils;
22 import com.wd.common.interact.collect.CollectTools; 22 import com.wd.common.interact.collect.CollectTools;
23 import com.wd.common.interact.collect.callback.CollectCallback; 23 import com.wd.common.interact.collect.callback.CollectCallback;
24 import com.wd.common.interact.interacts.callback.IInteractDataListener; 24 import com.wd.common.interact.interacts.callback.IInteractDataListener;
@@ -28,7 +28,7 @@ import com.wd.common.interact.like.QueryLikeStatusTools; @@ -28,7 +28,7 @@ import com.wd.common.interact.like.QueryLikeStatusTools;
28 import com.wd.common.interact.like.callback.LikeCallback; 28 import com.wd.common.interact.like.callback.LikeCallback;
29 import com.wd.common.interact.like.callback.QueryLikeStatusCallback; 29 import com.wd.common.interact.like.callback.QueryLikeStatusCallback;
30 import com.wd.common.listener.AddFavoriteLabelCallback; 30 import com.wd.common.listener.AddFavoriteLabelCallback;
31 -import com.wd.common.utils.PDUtils; 31 +import com.wd.foundation.wdkit.utils.PDUtils;
32 import com.wd.common.utils.ProcessUtils; 32 import com.wd.common.utils.ProcessUtils;
33 import com.wd.common.utils.ToolsUtil; 33 import com.wd.common.utils.ToolsUtil;
34 import com.wd.fastcoding.base.R; 34 import com.wd.fastcoding.base.R;
@@ -28,7 +28,7 @@ import com.wd.common.interact.like.QueryLikeStatusTools; @@ -28,7 +28,7 @@ import com.wd.common.interact.like.QueryLikeStatusTools;
28 import com.wd.common.interact.like.callback.LikeCallback; 28 import com.wd.common.interact.like.callback.LikeCallback;
29 import com.wd.common.interact.like.callback.QueryLikeStatusCallback; 29 import com.wd.common.interact.like.callback.QueryLikeStatusCallback;
30 import com.wd.common.listener.AddFavoriteLabelCallback; 30 import com.wd.common.listener.AddFavoriteLabelCallback;
31 -import com.wd.common.utils.PDUtils; 31 +import com.wd.foundation.wdkit.utils.PDUtils;
32 import com.wd.common.utils.ProcessUtils; 32 import com.wd.common.utils.ProcessUtils;
33 import com.wd.common.utils.ToolsUtil; 33 import com.wd.common.utils.ToolsUtil;
34 import com.wd.fastcoding.base.R; 34 import com.wd.fastcoding.base.R;
1 -package com.wd.common.widget.progress;  
2 -  
3 -import android.content.Context;  
4 -import android.util.AttributeSet;  
5 -import android.view.LayoutInflater;  
6 -import android.widget.FrameLayout;  
7 -import android.widget.ImageView;  
8 -  
9 -import androidx.annotation.Nullable;  
10 -  
11 -import com.wd.fastcoding.base.R;  
12 -import com.wd.foundation.wdkit.utils.SpUtils;  
13 -  
14 -  
15 -/**  
16 - * @Description: 组件和稿件页面的骨架图  
17 - * @Author: Li Yubing  
18 - * @Email: liyubing@wondert.com.cn  
19 - * @CreateDate: 2023/10/23 10:09  
20 - * @Version: 1.0  
21 - */  
22 -public class SkeletonLoadingView extends FrameLayout {  
23 -  
24 - private Context context;  
25 -  
26 - public SkeletonLoadingView(Context context) {  
27 - this(context, null);  
28 - }  
29 -  
30 - public SkeletonLoadingView(Context context, @Nullable AttributeSet attrs) {  
31 - this(context, attrs, 0);  
32 - }  
33 -  
34 - public SkeletonLoadingView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {  
35 - super(context, attrs, defStyleAttr);  
36 - this.context = context;  
37 - init();  
38 - }  
39 -  
40 - private void init() {  
41 - LayoutInflater.from(context).inflate(R.layout.small_skeleton_loading_view, this, true);  
42 - ImageView img = findViewById(R.id.img);  
43 - img.setBackgroundResource(SpUtils.isNightMode() ? R.mipmap.bg_gujia_default_image_night :  
44 - R.mipmap.bg_gujia_default_image);  
45 - }  
46 -  
47 -  
48 -}  
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 android:visibility="visible" 80 android:visibility="visible"
81 android:orientation="horizontal"> 81 android:orientation="horizontal">
82 82
83 - <com.wd.common.widget.RoundRectImageView 83 + <com.wd.foundation.wdkit.view.RoundRectImageView
84 android:id="@+id/push_image" 84 android:id="@+id/push_image"
85 android:layout_width="@dimen/rmrb_dp72" 85 android:layout_width="@dimen/rmrb_dp72"
86 android:layout_height="wrap_content" 86 android:layout_height="wrap_content"
@@ -43,8 +43,4 @@ @@ -43,8 +43,4 @@
43 <declare-styleable name="ClearScreenLayout"> 43 <declare-styleable name="ClearScreenLayout">
44 <attr name="touch_slop_sensitivity" format="float" /> 44 <attr name="touch_slop_sensitivity" format="float" />
45 </declare-styleable> 45 </declare-styleable>
46 - <!-- 缺省视图-->  
47 - <declare-styleable name="DefaultView">  
48 - <attr name="default_view_type" format="integer" />  
49 - </declare-styleable>  
50 </resources> 46 </resources>
@@ -121,7 +121,6 @@ @@ -121,7 +121,6 @@
121 <string name="sure_clear_cache">是否确认清除此APP的缓存</string> 121 <string name="sure_clear_cache">是否确认清除此APP的缓存</string>
122 <string name="sure_clear_common">Are you sure to delete?</string> 122 <string name="sure_clear_common">Are you sure to delete?</string>
123 <string name="sure_clear_search_history">确认清空历史记录？</string> 123 <string name="sure_clear_search_history">确认清空历史记录？</string>
124 - <string name="yes_btn">确定</string>  
125 <string name="open_btn">打开</string> 124 <string name="open_btn">打开</string>
126 <string name="cancel_btn">取消</string> 125 <string name="cancel_btn">取消</string>
127 <string name="yes_bind">确认解绑？</string> 126 <string name="yes_bind">确认解绑？</string>
@@ -129,7 +128,6 @@ @@ -129,7 +128,6 @@
129 <string name="cancel_bind_message">绑定失败</string> 128 <string name="cancel_bind_message">绑定失败</string>
130 <string name="cancel_bind_message_2">该账号不符合绑定要求或已经被绑定</string> 129 <string name="cancel_bind_message_2">该账号不符合绑定要求或已经被绑定</string>
131 <string name="tv_bind">解绑后讲无法继续使用该账号登录人民日报平台</string> 130 <string name="tv_bind">解绑后讲无法继续使用该账号登录人民日报平台</string>
132 - <string name="tips">提示</string>  
133 <string name="next">下一页</string> 131 <string name="next">下一页</string>
134 <string name="abandon">放弃</string> 132 <string name="abandon">放弃</string>
135 <string name="delete">删除</string> 133 <string name="delete">删除</string>
@@ -368,7 +366,6 @@ @@ -368,7 +366,6 @@
368 <!--暂无搜索结果--> 366 <!--暂无搜索结果-->
369 <string name="default_no_content_found">未找到内容</string> 367 <string name="default_no_content_found">未找到内容</string>
370 368
371 - <string name="up_load_more">上拉加载更多</string>  
372 <string name="no_net_tips">无网络</string> 369 <string name="no_net_tips">无网络</string>
373 <string name="weak_net_tips">网络有问题。请检查网络</string> 370 <string name="weak_net_tips">网络有问题。请检查网络</string>
374 <string name="click_retry">重试</string> 371 <string name="click_retry">重试</string>
@@ -377,8 +374,6 @@ @@ -377,8 +374,6 @@
377 <string name="seal_login_user_logout">用户已注销</string> 374 <string name="seal_login_user_logout">用户已注销</string>
378 <string name="seal_login_user_blocked">这个账号被封了！</string> 375 <string name="seal_login_user_blocked">这个账号被封了！</string>
379 376
380 - <string name="to_expand_hint">展开</string>  
381 - <string name="to_shrink_hint">收起</string>  
382 <!-- 加入聊天室失败--> 377 <!-- 加入聊天室失败-->
383 <string name="discovery_chat_room_join_failure">加入聊天室失败 </string> 378 <string name="discovery_chat_room_join_failure">加入聊天室失败 </string>
384 <!-- 你被禁止加入聊天室--> 379 <!-- 你被禁止加入聊天室-->
@@ -39,7 +39,10 @@ android { @@ -39,7 +39,10 @@ android {
39 dependencies { 39 dependencies {
40 implementation rootProject.ext.dependencies["androidxAppCompat"] 40 implementation rootProject.ext.dependencies["androidxAppCompat"]
41 implementation rootProject.ext.dependencies["material"] 41 implementation rootProject.ext.dependencies["material"]
  42 + implementation project(path: ':wdkit')
42 implementation project(path: ':wdlayout') 43 implementation project(path: ':wdlayout')
  44 + implementation project(path: ':lib_base')
  45 + implementation project(path: ':base_comment')
43 api project(path: ':wdrouter') 46 api project(path: ':wdrouter')
44 api project(path: ':wdinterface') 47 api project(path: ':wdinterface')
45 annotationProcessor 'com.alibaba:arouter-compiler:1.5.2' 48 annotationProcessor 'com.alibaba:arouter-compiler:1.5.2'
@@ -44,11 +44,10 @@ import com.wd.capability.network.constant.NetConstant; @@ -44,11 +44,10 @@ import com.wd.capability.network.constant.NetConstant;
44 import com.wd.common.base.BaseActivity; 44 import com.wd.common.base.BaseActivity;
45 //import com.wd.common.base.BaseDialog; 45 //import com.wd.common.base.BaseDialog;
46 import com.wd.foundation.wdkit.constant.Constants; 46 import com.wd.foundation.wdkit.constant.Constants;
47 -import com.wd.capability.network.constant.EventConstants; 47 +import com.wd.foundation.wdkit.constant.EventConstants;
48 import com.wd.common.constant.RouterConstants; 48 import com.wd.common.constant.RouterConstants;
49 -import com.wd.common.imageglide.ImageUtils;  
50 import com.wd.common.net.NetStateChangeReceiver; 49 import com.wd.common.net.NetStateChangeReceiver;
51 -import com.wd.common.utils.GrayManager; 50 +import com.wd.foundation.wdkit.utils.GrayManager;
52 import com.wd.common.utils.ProcessUtils; 51 import com.wd.common.utils.ProcessUtils;
53 import com.wd.foundation.wdkit.constant.ProtocolConstant; 52 import com.wd.foundation.wdkit.constant.ProtocolConstant;
54 import com.wd.foundation.bean.custom.MenuBean; 53 import com.wd.foundation.bean.custom.MenuBean;
@@ -57,6 +56,7 @@ import com.wd.foundation.bean.custom.video.TouchBean; @@ -57,6 +56,7 @@ import com.wd.foundation.bean.custom.video.TouchBean;
57 import com.wd.foundation.bean.livedate.NetStateMessage; 56 import com.wd.foundation.bean.livedate.NetStateMessage;
58 import com.wd.foundation.bean.response.BottomNavBean; 57 import com.wd.foundation.bean.response.BottomNavBean;
59 import com.wd.foundation.bean.response.MourningModelBean; 58 import com.wd.foundation.bean.response.MourningModelBean;
  59 +import com.wd.foundation.wdkit.imageglide.ImageUtils;
60 import com.wd.foundation.wdkit.statusbar.StatusBarStyleEnum; 60 import com.wd.foundation.wdkit.statusbar.StatusBarStyleEnum;
61 import com.wd.foundation.wdkit.system.FastClickUtil; 61 import com.wd.foundation.wdkit.system.FastClickUtil;
62 import com.wd.foundation.wdkit.utils.FilletUtil; 62 import com.wd.foundation.wdkit.utils.FilletUtil;
@@ -8,13 +8,13 @@ import android.widget.FrameLayout; @@ -8,13 +8,13 @@ import android.widget.FrameLayout;
8 8
9 import com.alibaba.android.arouter.facade.annotation.Route; 9 import com.alibaba.android.arouter.facade.annotation.Route;
10 import com.alibaba.fastjson.JSONObject; 10 import com.alibaba.fastjson.JSONObject;
11 -import com.wd.capability.layout.page.ItemElectronPapterLayoutManager; 11 +import com.wd.module_home.paper.ItemElectronPapterLayoutManager;
12 import com.wd.capability.router.data.ActionBean; 12 import com.wd.capability.router.data.ActionBean;
13 import com.wd.common.base.BaseActivity; 13 import com.wd.common.base.BaseActivity;
14 -import com.wd.common.constant.PageNameConstants; 14 +import com.wd.foundation.wdkit.constant.PageNameConstants;
15 import com.wd.common.constant.RegionNameConstants; 15 import com.wd.common.constant.RegionNameConstants;
16 import com.wd.common.constant.RouterConstants; 16 import com.wd.common.constant.RouterConstants;
17 -import com.wd.common.utils.BarUtils; 17 +import com.wd.foundation.wdkit.utils.BarUtils;
18 import com.wd.foundation.bean.analytics.TrackContentBean; 18 import com.wd.foundation.bean.analytics.TrackContentBean;
19 import com.wd.foundation.bean.custom.MenuBean; 19 import com.wd.foundation.bean.custom.MenuBean;
20 import com.wd.foundation.wdkit.constant.GlobalAppCacheData; 20 import com.wd.foundation.wdkit.constant.GlobalAppCacheData;
1 -package com.wd.capability.layout.comp.layoutmanager.adapter.paper; 1 +package com.wd.module_home.adapter.paper;
2 2
3 /** 3 /**
4 * Created by lxy on 2016/10/11. 4 * Created by lxy on 2016/10/11.
1 -package com.wd.capability.layout.comp.layoutmanager.adapter.paper; 1 +package com.wd.module_home.adapter.paper;
2 2
3 import android.content.Context; 3 import android.content.Context;
4 import android.view.LayoutInflater; 4 import android.view.LayoutInflater;
@@ -13,8 +13,9 @@ import androidx.recyclerview.widget.RecyclerView; @@ -13,8 +13,9 @@ import androidx.recyclerview.widget.RecyclerView;
13 import com.wd.capability.layout.R; 13 import com.wd.capability.layout.R;
14 import com.wd.capability.layout.ui.widget.paper.AreaImageView; 14 import com.wd.capability.layout.ui.widget.paper.AreaImageView;
15 import com.wd.capability.layout.uitls.ObjectTools; 15 import com.wd.capability.layout.uitls.ObjectTools;
16 -import com.wd.common.imageglide.ImageUtils;  
17 import com.wd.common.utils.ProcessUtils; 16 import com.wd.common.utils.ProcessUtils;
  17 +import com.wd.foundation.wdkit.imageglide.ImageUtils;
  18 +
18 import com.wd.foundation.bean.paper.PaperPageBean; 19 import com.wd.foundation.bean.paper.PaperPageBean;
19 import com.wd.foundation.bean.paper.PaperPageItemBean; 20 import com.wd.foundation.bean.paper.PaperPageItemBean;
20 21
1 -package com.wd.capability.layout.ui.paper; 1 +package com.wd.module_home.paper;
2 2
3 -import android.content.DialogInterface;  
4 import android.view.View; 3 import android.view.View;
5 4
6 import androidx.fragment.app.FragmentActivity; 5 import androidx.fragment.app.FragmentActivity;
7 6
8 -import com.wd.capability.layout.page.ItemElectronPapterLayoutManager;  
9 import com.wd.capability.network.response.ExceptionHandle; 7 import com.wd.capability.network.response.ExceptionHandle;
10 import com.wd.capability.network.utils.NetworkUtil; 8 import com.wd.capability.network.utils.NetworkUtil;
11 -import com.wd.common.viewclick.BaseClickListener; 9 +import com.wd.foundation.wdkit.viewclick.BaseClickListener;
12 import com.wd.foundation.bean.paper.PaperNumInforBean; 10 import com.wd.foundation.bean.paper.PaperNumInforBean;
13 import com.wd.foundation.bean.paper.PaperPageBean; 11 import com.wd.foundation.bean.paper.PaperPageBean;
14 import com.wd.foundation.wdkit.utils.ToastNightUtil; 12 import com.wd.foundation.wdkit.utils.ToastNightUtil;
1 -package com.wd.capability.layout.ui.paper; 1 +package com.wd.module_home.paper;
2 2
3 import android.graphics.Color; 3 import android.graphics.Color;
4 import android.graphics.drawable.ColorDrawable; 4 import android.graphics.drawable.ColorDrawable;
@@ -19,7 +19,6 @@ import androidx.fragment.app.FragmentActivity; @@ -19,7 +19,6 @@ import androidx.fragment.app.FragmentActivity;
19 19
20 20
21 import com.wd.capability.layout.R; 21 import com.wd.capability.layout.R;
22 -import com.wd.capability.layout.page.ItemElectronPapterLayoutManager;  
23 import com.wd.capability.layout.ui.widget.calendar.CalendarView; 22 import com.wd.capability.layout.ui.widget.calendar.CalendarView;
24 import com.wd.capability.layout.ui.widget.calendar.DateData; 23 import com.wd.capability.layout.ui.widget.calendar.DateData;
25 import com.wd.capability.layout.ui.widget.calendar.MonthListener; 24 import com.wd.capability.layout.ui.widget.calendar.MonthListener;
1 -package com.wd.capability.layout.page; 1 +package com.wd.module_home.paper;
2 2
3 import android.text.TextUtils; 3 import android.text.TextUtils;
4 import android.view.View; 4 import android.view.View;
@@ -12,11 +12,8 @@ import androidx.recyclerview.widget.RecyclerView; @@ -12,11 +12,8 @@ import androidx.recyclerview.widget.RecyclerView;
12 12
13 import com.wd.capability.layout.R; 13 import com.wd.capability.layout.R;
14 import com.wd.capability.layout.comp.layoutmanager.ItemContainerManager; 14 import com.wd.capability.layout.comp.layoutmanager.ItemContainerManager;
15 -import com.wd.capability.layout.ui.paper.PaperContract;  
16 -import com.wd.capability.layout.ui.paper.PaperHelpFactory;  
17 -import com.wd.capability.layout.ui.paper.PaperHelper;  
18 -import com.wd.common.imageglide.ImageUtils;  
19 -import com.wd.common.viewclick.BaseClickListener; 15 +import com.wd.foundation.wdkit.imageglide.ImageUtils;
  16 +import com.wd.foundation.wdkit.viewclick.BaseClickListener;
20 import com.wd.foundation.bean.custom.MenuBean; 17 import com.wd.foundation.bean.custom.MenuBean;
21 import com.wd.foundation.bean.paper.PaperPageBean; 18 import com.wd.foundation.bean.paper.PaperPageBean;
22 import com.wd.foundation.bean.utils.TimeUtil; 19 import com.wd.foundation.bean.utils.TimeUtil;
1 -package com.wd.capability.layout.ui.paper; 1 +package com.wd.module_home.paper;
2 2
3 3
4 import android.view.View; 4 import android.view.View;
@@ -10,7 +10,6 @@ import androidx.recyclerview.widget.RecyclerView; @@ -10,7 +10,6 @@ import androidx.recyclerview.widget.RecyclerView;
10 10
11 11
12 import com.wd.capability.layout.R; 12 import com.wd.capability.layout.R;
13 -import com.wd.capability.layout.page.ItemElectronPapterLayoutManager;  
14 import com.wd.foundation.bean.paper.PaperPageBean; 13 import com.wd.foundation.bean.paper.PaperPageBean;
15 import com.wd.foundation.wdkitcore.tools.ArrayUtils; 14 import com.wd.foundation.wdkitcore.tools.ArrayUtils;
16 15