fragments, String[] titles) {
- super(fm);
- this.fragments = fragments;
- this.titles = titles;
- }
-
- @Override
- public int getCount() {
- return fragments.size();
- }
-
- @Override
- public CharSequence getPageTitle(int position) {
- return titles[position];
- }
-
- @Override
- public Fragment getItem(int position) {
- return fragments.get(position);
- }
-
- @Override
- public void destroyItem(ViewGroup container, int position, Object object) {
- // 覆写destroyItem并且空实现,这样每个Fragment中的视图就不会被销毁
- // super.destroyItem(container, position, object);
- }
-
- @Override
- public int getItemPosition(Object object) {
- return PagerAdapter.POSITION_NONE;
- }
- }
-
- @Override
- protected Parcelable onSaveInstanceState() {
- Bundle bundle = new Bundle();
- bundle.putParcelable("instanceState", super.onSaveInstanceState());
- bundle.putInt("mCurrentTab", mCurrentTab);
- return bundle;
- }
-
- @Override
- protected void onRestoreInstanceState(Parcelable state) {
- if (state instanceof Bundle) {
- Bundle bundle = (Bundle) state;
- mCurrentTab = bundle.getInt("mCurrentTab");
- state = bundle.getParcelable("instanceState");
- if (mCurrentTab != 0 && mTabsContainer.getChildCount() > 0) {
- updateTabSelection(mCurrentTab);
- scrollToCurrentTab();
- }
- }
- super.onRestoreInstanceState(state);
- }
-
- protected int dp2px(float dp) {
- final float scale = mContext.getResources().getDisplayMetrics().density;
- return (int) (dp * scale + 0.5f);
- }
-
- protected int sp2px(float sp) {
- final float scale = this.mContext.getResources().getDisplayMetrics().scaledDensity;
- return (int) (sp * scale + 0.5f);
- }
-}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/CustomExpandableText.java b/app/src/main/java/com/yizhuan/erban/ui/widget/CustomExpandableText.java
index e45de7b23..be3c59d42 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/CustomExpandableText.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/CustomExpandableText.java
@@ -6,8 +6,8 @@ import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.SparseBooleanArray;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/DefaultToolBar.java b/app/src/main/java/com/yizhuan/erban/ui/widget/DefaultToolBar.java
index 4a78a9d87..0de44b319 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/DefaultToolBar.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/DefaultToolBar.java
@@ -1,9 +1,9 @@
package com.yizhuan.erban.ui.widget;
import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.widget.Toolbar;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/DividerItemDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/DividerItemDecoration.java
index 0138b9555..b8f05c053 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/DividerItemDecoration.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/DividerItemDecoration.java
@@ -4,8 +4,8 @@ import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Rect;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.TypedValue;
import android.view.View;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/DividerUtil.java b/app/src/main/java/com/yizhuan/erban/ui/widget/DividerUtil.java
index 583d000ff..e2213a8a1 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/DividerUtil.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/DividerUtil.java
@@ -1,8 +1,8 @@
package com.yizhuan.erban.ui.widget;
import android.graphics.Rect;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.yizhuan.xchat_android_library.utils.SizeUtils;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/FixedTouchViewPager.java b/app/src/main/java/com/yizhuan/erban/ui/widget/FixedTouchViewPager.java
index 2dc317570..923dc2c6b 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/FixedTouchViewPager.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/FixedTouchViewPager.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.widget;
import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/FlickerAvatarView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/FlickerAvatarView.java
index 98901558c..5aefcc954 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/FlickerAvatarView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/FlickerAvatarView.java
@@ -3,9 +3,9 @@ package com.yizhuan.erban.ui.widget;
import android.animation.Animator;
import android.animation.ObjectAnimator;
import android.content.Context;
-import android.databinding.DataBindingUtil;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.view.animation.AccelerateInterpolator;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftAvatarAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftAvatarAdapter.java
index c958cff63..3d07d4395 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftAvatarAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftAvatarAdapter.java
@@ -2,7 +2,7 @@ package com.yizhuan.erban.ui.widget;
import android.content.Context;
import android.graphics.drawable.GradientDrawable;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
index 1337e4219..f5531ea56 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
@@ -1,17 +1,17 @@
package com.yizhuan.erban.ui.widget;
import android.annotation.SuppressLint;
-import android.arch.lifecycle.Observer;
+import androidx.lifecycle.Observer;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetDialog;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -99,16 +99,13 @@ import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Objects;
import io.reactivex.Single;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.BiConsumer;
import io.reactivex.functions.Consumer;
/**
@@ -287,7 +284,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
setContentView(R.layout.dialog_bottom_gift);
compositeDisposable = new CompositeDisposable();
init(findViewById(R.id.ll_dialog_bottom_gift));
- FrameLayout bottomSheet = findViewById(android.support.design.R.id.design_bottom_sheet);
+ FrameLayout bottomSheet = findViewById(R.id.design_bottom_sheet);
if (bottomSheet != null) {
BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false);
BottomSheetBehavior.from(bottomSheet).setHideable(false);
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftRecyclerView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftRecyclerView.java
index eee62c589..2a4ee762e 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftRecyclerView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftRecyclerView.java
@@ -1,9 +1,9 @@
package com.yizhuan.erban.ui.widget;
import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.ViewConfiguration;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/InterceptTouchLayout.java b/app/src/main/java/com/yizhuan/erban/ui/widget/InterceptTouchLayout.java
index 7c65dff11..44c089862 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/InterceptTouchLayout.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/InterceptTouchLayout.java
@@ -3,8 +3,8 @@ package com.yizhuan.erban.ui.widget;
import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.widget.FrameLayout;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/LinearLayoutManagerWrapper.java b/app/src/main/java/com/yizhuan/erban/ui/widget/LinearLayoutManagerWrapper.java
index 8148e2d67..4127c7d42 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/LinearLayoutManagerWrapper.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/LinearLayoutManagerWrapper.java
@@ -1,8 +1,8 @@
package com.yizhuan.erban.ui.widget;
import android.content.Context;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.AttributeSet;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/LivingIconView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/LivingIconView.java
index b6753b4dc..aed5a7414 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/LivingIconView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/LivingIconView.java
@@ -4,8 +4,8 @@ import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.drawable.AnimationDrawable;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
import android.util.AttributeSet;
import android.view.ViewGroup;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingAdapter.java
index abac9fc71..ff00e834e 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingAdapter.java
@@ -1,9 +1,9 @@
package com.yizhuan.erban.ui.widget;
-import android.support.annotation.IntDef;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.annotation.IntDef;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingDialog.java
index 0b790a8ec..dc36ef896 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/LoadingDialog.java
@@ -2,7 +2,7 @@ package com.yizhuan.erban.ui.widget;
import android.content.Context;
import android.os.Bundle;
-import android.support.v7.app.AppCompatDialog;
+import androidx.appcompat.app.AppCompatDialog;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.widget.ImageView;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MagicAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/widget/MagicAdapter.java
index c344c9599..3902d385a 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/MagicAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/MagicAdapter.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.widget;
import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MagicRecyclerView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/MagicRecyclerView.java
index b916b4812..47319e5d7 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/MagicRecyclerView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/MagicRecyclerView.java
@@ -1,14 +1,11 @@
package com.yizhuan.erban.ui.widget;
import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.AttributeSet;
import android.view.MotionEvent;
-import com.netease.nim.uikit.common.util.log.LogUtil;
-
/**
* @author xiaoyu
* @date 2017/12/12
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MainRedPointTab.java b/app/src/main/java/com/yizhuan/erban/ui/widget/MainRedPointTab.java
index bf4973a8d..5e284a087 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/MainRedPointTab.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/MainRedPointTab.java
@@ -3,8 +3,8 @@ package com.yizhuan.erban.ui.widget;
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.res.TypedArray;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.RelativeLayout;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MainTab.java b/app/src/main/java/com/yizhuan/erban/ui/widget/MainTab.java
index 55b00c85c..88419e1f4 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/MainTab.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/MainTab.java
@@ -3,22 +3,20 @@ package com.yizhuan.erban.ui.widget;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
-import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
import android.util.AttributeSet;
import android.view.Gravity;
import com.netease.nim.uikit.common.util.sys.ScreenUtil;
-import com.orhanobut.logger.Logger;
import com.yizhuan.erban.R;
/**
* main tab 控件
* Created by Administrator on 2017/11/14.
*/
-public class MainTab extends android.support.v7.widget.AppCompatTextView {
+public class MainTab extends androidx.appcompat.widget.AppCompatTextView {
private static final int DEFAULT_COLOR = Color.parseColor("#333333");
private int mTabIcon, mTabIconSelect;
private int mTabtextColor, mTabTextSelectColor;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MainTabLayout.java b/app/src/main/java/com/yizhuan/erban/ui/widget/MainTabLayout.java
index 291d1fe1a..76b7880e9 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/MainTabLayout.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/MainTabLayout.java
@@ -2,7 +2,7 @@ package com.yizhuan.erban.ui.widget;
import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.LinearLayout;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MarqueeLayout.java b/app/src/main/java/com/yizhuan/erban/ui/widget/MarqueeLayout.java
index b4adeeeef..9755b7e04 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/MarqueeLayout.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/MarqueeLayout.java
@@ -5,8 +5,8 @@ import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.text.TextPaint;
import android.util.AttributeSet;
import android.view.animation.LinearInterpolator;
@@ -15,7 +15,6 @@ import android.widget.TextView;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_library.utils.ScreenUtils;
-import com.yizhuan.xchat_android_library.utils.SizeUtils;
import com.yizhuan.xchat_android_library.utils.log.MLog;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/MyItemAnimator.java b/app/src/main/java/com/yizhuan/erban/ui/widget/MyItemAnimator.java
index 33e7b0e57..16ed93f33 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/MyItemAnimator.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/MyItemAnimator.java
@@ -4,10 +4,10 @@ import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.TimeInterpolator;
import android.animation.ValueAnimator;
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.SimpleItemAnimator;
-import android.support.v7.widget.RecyclerView.ViewHolder;
+import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.SimpleItemAnimator;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
import android.view.View;
import android.view.ViewPropertyAnimator;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/NobleAvatarView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/NobleAvatarView.java
index e5232cc99..824d3448e 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/NobleAvatarView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/NobleAvatarView.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.widget;
import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.widget.ImageView;
@@ -15,7 +15,6 @@ import com.yizhuan.xchat_android_core.noble.NobleInfo;
import com.yizhuan.xchat_android_core.noble.NobleResourceType;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember;
-import com.yizhuan.xchat_android_core.user.bean.FansInfo;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/NobleOpenNoticeView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/NobleOpenNoticeView.java
index b7c0b427d..9701f1dab 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/NobleOpenNoticeView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/NobleOpenNoticeView.java
@@ -2,7 +2,7 @@ package com.yizhuan.erban.ui.widget;
import android.content.Context;
import android.graphics.Color;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
@@ -19,7 +19,6 @@ import com.opensource.svgaplayer.SVGAImageView;
import com.opensource.svgaplayer.SVGAParser;
import com.opensource.svgaplayer.SVGAVideoEntity;
import com.yizhuan.erban.R;
-import com.yizhuan.xchat_android_library.utils.SizeUtils;
import com.yizhuan.xchat_android_core.noble.NobleInfo;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/NumView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/NumView.java
index de5496b59..960ed836e 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/NumView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/NumView.java
@@ -1,12 +1,11 @@
package com.yizhuan.erban.ui.widget;
import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.widget.ImageView;
import android.widget.LinearLayout;
-import com.netease.nim.uikit.common.util.log.LogUtil;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ObservableScrollView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/ObservableScrollView.java
index 36e5f637d..3e20a615b 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/ObservableScrollView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/ObservableScrollView.java
@@ -5,7 +5,7 @@ package com.yizhuan.erban.ui.widget;
*/
import android.content.Context;
-import android.support.v4.widget.NestedScrollView;
+import androidx.core.widget.NestedScrollView;
import android.util.AttributeSet;
import com.netease.nim.uikit.common.util.log.LogUtil;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/OnPageSelectedListener.java b/app/src/main/java/com/yizhuan/erban/ui/widget/OnPageSelectedListener.java
index 748c72a0f..e527e014a 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/OnPageSelectedListener.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/OnPageSelectedListener.java
@@ -1,6 +1,6 @@
package com.yizhuan.erban.ui.widget;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
/**
*
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/PinEntryEditText.java b/app/src/main/java/com/yizhuan/erban/ui/widget/PinEntryEditText.java
index 1309dc011..41e6efd7a 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/PinEntryEditText.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/PinEntryEditText.java
@@ -28,10 +28,10 @@ import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.AppCompatEditText;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.appcompat.widget.AppCompatEditText;
import android.text.InputFilter;
import android.text.InputType;
import android.text.TextUtils;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerRefreshLayout.java b/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerRefreshLayout.java
index 90c4708b6..5bc6e3fa1 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerRefreshLayout.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerRefreshLayout.java
@@ -1,11 +1,11 @@
package com.yizhuan.erban.ui.widget;
import android.content.Context;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoBugLinearLayoutManager.java b/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoBugLinearLayoutManager.java
index 644f5bbab..2bfdf89e9 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoBugLinearLayoutManager.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoBugLinearLayoutManager.java
@@ -1,8 +1,8 @@
package com.yizhuan.erban.ui.widget;
import android.content.Context;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.AttributeSet;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoViewpagerScroll.java b/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoViewpagerScroll.java
index cda2c3e01..4a843eea5 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoViewpagerScroll.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/RecyclerViewNoViewpagerScroll.java
@@ -1,8 +1,8 @@
package com.yizhuan.erban.ui.widget;
import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.AttributeSet;
import android.view.MotionEvent;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RedPointView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/RedPointView.java
index b46fd7792..4da1bdcb3 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/RedPointView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/RedPointView.java
@@ -5,8 +5,8 @@ import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Rect;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatTextView;
import android.text.TextPaint;
import android.text.TextUtils;
import android.util.AttributeSet;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/RoomItemView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/RoomItemView.java
index 022e13075..eb670acad 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/RoomItemView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/RoomItemView.java
@@ -3,8 +3,8 @@ package com.yizhuan.erban.ui.widget;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.text.StaticLayout;
+import androidx.annotation.Nullable;
+
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
@@ -20,12 +20,10 @@ import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
-import com.netease.nim.uikit.common.util.log.LogUtil;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.ui.widget.marqueeview.Utils;
import com.yizhuan.xchat_android_core.home.bean.HomeRoom;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java
index 754e32dc8..0c3971939 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java
@@ -2,13 +2,12 @@ package com.yizhuan.erban.ui.widget;
import android.content.Context;
import android.os.Bundle;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetDialog;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
import android.view.View;
import android.view.WindowManager;
import android.widget.FrameLayout;
import android.widget.TextView;
-import android.widget.Toast;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.marqueeview.Utils;
@@ -79,7 +78,7 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
tvQqZone.setOnClickListener(this);
tvCancel.setOnClickListener(this);
findViewById(R.id.tv_qq_game).setOnClickListener(this);
- FrameLayout bottomSheet = (FrameLayout) findViewById(android.support.design.R.id.design_bottom_sheet);
+ FrameLayout bottomSheet = (FrameLayout) findViewById(R.id.design_bottom_sheet);
if (bottomSheet != null) {
BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false);
}
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareRedBagDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareRedBagDialog.java
index a649a2798..ee5b04923 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareRedBagDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareRedBagDialog.java
@@ -2,9 +2,9 @@ package com.yizhuan.erban.ui.widget;
import android.app.Dialog;
import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StyleRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
/**
* Created by Seven on 2017/9/24.
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/SquareImageView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/SquareImageView.java
index 1b85e3b3d..d3563300e 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/SquareImageView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/SquareImageView.java
@@ -6,7 +6,7 @@ import android.util.AttributeSet;
/**
* Created by chenran on 2017/7/24.
*/
-public class SquareImageView extends android.support.v7.widget.AppCompatImageView {
+public class SquareImageView extends androidx.appcompat.widget.AppCompatImageView {
public SquareImageView(Context context, AttributeSet attrs, int defStyle) {
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java b/app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java
index 5c7cdc92d..007d85653 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/SuperEditText.java
@@ -3,8 +3,8 @@ package com.yizhuan.erban.ui.widget;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.text.InputType;
import android.util.AttributeSet;
import android.widget.EditText;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
index 84a3deb3f..b2bbb3878 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoDialog.java
@@ -3,10 +3,10 @@ package com.yizhuan.erban.ui.widget;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Bundle;
-import android.support.v7.app.AppCompatDialog;
-import android.support.v7.widget.AppCompatImageView;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatDialog;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -17,7 +17,6 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
-import android.widget.Toast;
import com.google.android.flexbox.FlexboxLayout;
import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoView.java
index 6129adcdc..0c40deb13 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/UserInfoView.java
@@ -1,8 +1,8 @@
package com.yizhuan.erban.ui.widget;
import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.Gravity;
@@ -13,13 +13,10 @@ import android.widget.TextView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.utils.RegexUtil;
-import com.yizhuan.xchat_android_core.level.UserLevelVo;
import com.yizhuan.xchat_android_core.user.bean.SimpleUserInfo;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import butterknife.BindView;
import butterknife.ButterKnife;
-import lombok.Data;
/**
* 用户信息展示 一个通用的展示，用户昵称，性别，经验等级，魅力等级
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/UserMagicIndicator.java b/app/src/main/java/com/yizhuan/erban/ui/widget/UserMagicIndicator.java
index d86a98205..4ebb92d1b 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/UserMagicIndicator.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/UserMagicIndicator.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.widget;
import android.content.Context;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.view.ViewGroup;
import android.widget.FrameLayout;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftDialog.java
index 4ac41c231..cbd3f9ca4 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftDialog.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.widget.dialog;
import android.content.Context;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java
index d54fa441e..9e2cc86f7 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelOneDialog.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.widget.dialog;
import android.content.Context;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java
index 8e3299d09..6690087cc 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelThreeDialog.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.widget.dialog;
import android.content.Context;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
import android.graphics.Color;
import android.graphics.Point;
import android.graphics.drawable.ColorDrawable;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java
index 5e8950e6b..526f12cfa 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/AllServiceGiftLevelTwoDialog.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.widget.dialog;
import android.content.Context;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
import android.graphics.Color;
import android.graphics.Point;
import android.graphics.drawable.ColorDrawable;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/BaseDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/BaseDialog.java
index b7c1568ed..6232ffd3d 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/BaseDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/BaseDialog.java
@@ -1,8 +1,7 @@
package com.yizhuan.erban.ui.widget.dialog;
import android.content.Context;
-import android.support.v7.app.AppCompatDialog;
-import android.widget.Toast;
+import androidx.appcompat.app.AppCompatDialog;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/MonsterDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/MonsterDialog.java
index 8fa11c5b1..8950d3ae0 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/MonsterDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/MonsterDialog.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.widget.dialog;
import android.content.Context;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleDialog.java
index da7a54a48..78e7305f8 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleDialog.java
@@ -1,15 +1,10 @@
package com.yizhuan.erban.ui.widget.dialog;
import android.content.Context;
-import android.graphics.Color;
-import android.graphics.Paint;
import android.os.Bundle;
-import android.support.v7.app.AppCompatDialog;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
+import androidx.appcompat.app.AppCompatDialog;
+
import android.text.TextUtils;
-import android.text.style.ForegroundColorSpan;
-import android.util.TypedValue;
import android.view.View;
import android.widget.TextView;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java
index a61df78b0..f6947d9ce 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dialog/OpenNobleGlobalNoticeDialog.java
@@ -5,14 +5,13 @@ import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
-import android.support.v7.app.AppCompatDialog;
+import androidx.appcompat.app.AppCompatDialog;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.Window;
import android.view.WindowManager;
import com.yizhuan.erban.R;
-import com.yizhuan.erban.application.XChatApplication;
import com.yizhuan.xchat_android_library.utils.SizeUtils;
import com.yizhuan.erban.ui.widget.MarqueeLayout;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java
index 7aa93f070..b12ab471c 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/dynamicface/DynamicFaceDialog.java
@@ -2,10 +2,10 @@ package com.yizhuan.erban.ui.widget.dynamicface;
import android.content.Context;
import android.os.Bundle;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetDialog;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -14,12 +14,10 @@ import android.widget.FrameLayout;
import android.widget.GridView;
import android.widget.LinearLayout;
import android.widget.TextView;
-import android.widget.Toast;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.dialog.OpenNobleDialog;
import com.yizhuan.erban.ui.widget.marqueeview.Utils;
-import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel;
import com.yizhuan.xchat_android_core.room.event.FaceIsReadyEvent;
import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel;
@@ -69,7 +67,7 @@ public class DynamicFaceDialog extends BottomSheetDialog
setContentView(R.layout.dialog_bottom_face);
EventBus.getDefault().register(this);
init(findViewById(R.id.rl_dynamic_face_dialog_root));
- FrameLayout bottomSheet = (FrameLayout) findViewById(android.support.design.R.id.design_bottom_sheet);
+ FrameLayout bottomSheet = (FrameLayout) findViewById(R.id.design_bottom_sheet);
if (bottomSheet != null) {
BottomSheetBehavior.from(bottomSheet).setSkipCollapsed(false);
BottomSheetBehavior.from(bottomSheet).setPeekHeight(
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/HiGuide.java b/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/HiGuide.java
index e27e57a74..45ea20298 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/HiGuide.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/HiGuide.java
@@ -2,7 +2,7 @@ package com.yizhuan.erban.ui.widget.higuide;
import android.app.Activity;
import android.content.Context;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/Overlay.java b/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/Overlay.java
index 5c1b99a18..2db4f4b26 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/Overlay.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/Overlay.java
@@ -2,9 +2,9 @@ package com.yizhuan.erban.ui.widget.higuide;
import android.graphics.Color;
import android.graphics.RectF;
-import android.support.annotation.IntDef;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
+import androidx.annotation.IntDef;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
import android.view.View;
import java.util.ArrayList;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideView.java
index f663cf7dc..b0f9aa73a 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/higuide/TuTuGuideView.java
@@ -4,7 +4,7 @@ import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Path;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.View;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java
index 6a95b7eb0..c8ab8311f 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/GiftIndicator.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.widget.magicindicator;
import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ViewPagerHelper.java b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ViewPagerHelper.java
index 5bb7a4c14..de374f4b9 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ViewPagerHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ViewPagerHelper.java
@@ -1,6 +1,6 @@
package com.yizhuan.erban.ui.widget.magicindicator;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java
index 5298bebaa..d47c8bd46 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/magicindicator/ext/MainCommonNavigatorAdapter.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.widget.magicindicator.ext;
import android.content.Context;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/AvRoomNobleWelcomeView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/AvRoomNobleWelcomeView.java
index 25a8008c3..2a39793c1 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/AvRoomNobleWelcomeView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/AvRoomNobleWelcomeView.java
@@ -5,7 +5,7 @@ import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.content.Context;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
import android.text.TextPaint;
import android.text.TextUtils;
import android.util.AttributeSet;
@@ -14,7 +14,6 @@ import android.view.animation.LinearInterpolator;
import android.widget.RelativeLayout;
import android.widget.TextView;
-import com.netease.nim.uikit.common.util.sys.ScreenUtil;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_library.utils.ScreenUtils;
import com.yizhuan.xchat_android_library.utils.SizeUtils;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/HomeRankingView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/HomeRankingView.java
index 3eae76f75..7ee687357 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/HomeRankingView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/HomeRankingView.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.widget.marqueeview;
import android.content.Context;
-import android.support.annotation.AnimRes;
+import androidx.annotation.AnimRes;
import android.util.AttributeSet;
import android.util.SparseArray;
import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/MarqueeView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/MarqueeView.java
index 859e08f5f..c808f2a47 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/MarqueeView.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/marqueeview/MarqueeView.java
@@ -3,7 +3,7 @@ package com.yizhuan.erban.ui.widget.marqueeview;
import android.content.Context;
import android.content.res.TypedArray;
import android.os.Build;
-import android.support.annotation.AnimRes;
+import androidx.annotation.AnimRes;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.Gravity;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java b/app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java
index 8e50bad1b..977e25031 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java
@@ -4,9 +4,9 @@ package com.yizhuan.erban.ui.widget.password;
import android.app.Activity;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
import android.util.DisplayMetrics;
import android.view.Display;
import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/ColorDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/ColorDecoration.java
index b6670ac49..2b28021d7 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/ColorDecoration.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/ColorDecoration.java
@@ -2,10 +2,10 @@ package com.yizhuan.erban.ui.widget.recyclerview.decoration;
import android.graphics.Canvas;
import android.graphics.Rect;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.view.View;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DividerItemDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DividerItemDecoration.java
index aa0d45d9c..cc1e9de39 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DividerItemDecoration.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/DividerItemDecoration.java
@@ -5,8 +5,8 @@ import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import io.reactivex.annotations.NonNull;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java
index a6149e8ce..aae3d1c92 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridSpacingItemDecoration.java
@@ -2,7 +2,7 @@ package com.yizhuan.erban.ui.widget.recyclerview.decoration;
import android.content.Context;
import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.TypedValue;
import android.view.View;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridVItemDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridVItemDecoration.java
index 6344deaff..dc362677d 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridVItemDecoration.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/GridVItemDecoration.java
@@ -2,7 +2,7 @@ package com.yizhuan.erban.ui.widget.recyclerview.decoration;
import android.content.Context;
import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/HorizontalDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/HorizontalDecoration.java
index 4bd3e7b5d..d5662f83c 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/HorizontalDecoration.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/HorizontalDecoration.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.widget.recyclerview.decoration;
import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import lombok.Setter;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/SpacingDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/SpacingDecoration.java
index d430a056a..905b973a1 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/SpacingDecoration.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/SpacingDecoration.java
@@ -1,10 +1,10 @@
package com.yizhuan.erban.ui.widget.recyclerview.decoration;
import android.graphics.Rect;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.view.View;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/VerticalDecoration.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/VerticalDecoration.java
index 083200610..97b0c50c5 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/VerticalDecoration.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/decoration/VerticalDecoration.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.widget.recyclerview.decoration;
import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
/**
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java
index 2553cbf89..05eef6811 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyGridLayoutManager.java
@@ -1,8 +1,8 @@
package com.yizhuan.erban.ui.widget.recyclerview.layoutmanager;
import android.content.Context;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java
index 607cb493f..0063aea55 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/widget/recyclerview/layoutmanager/FullyLinearLayoutManager.java
@@ -1,8 +1,8 @@
package com.yizhuan.erban.ui.widget.recyclerview.layoutmanager;
import android.content.Context;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java b/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java
index 969d1091a..27c1e9698 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java
@@ -3,8 +3,8 @@ package com.yizhuan.erban.ui.withdraw;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.text.style.ForegroundColorSpan;
import android.view.View;
diff --git a/app/src/main/java/com/yizhuan/erban/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java b/app/src/main/java/com/yizhuan/erban/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java
index 7546d51e8..7c6b0140a 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.ui.withdraw.bankcard;
import android.os.Bundle;
-import android.support.design.widget.TextInputEditText;
+import com.google.android.material.textfield.TextInputEditText;
import android.text.Editable;
import android.text.TextUtils;
import android.view.View;
diff --git a/app/src/main/java/com/yizhuan/erban/utils/AppBarStateChangeListener.java b/app/src/main/java/com/yizhuan/erban/utils/AppBarStateChangeListener.java
index fae84a067..6ebc8de01 100644
--- a/app/src/main/java/com/yizhuan/erban/utils/AppBarStateChangeListener.java
+++ b/app/src/main/java/com/yizhuan/erban/utils/AppBarStateChangeListener.java
@@ -1,6 +1,6 @@
package com.yizhuan.erban.utils;
-import android.support.design.widget.AppBarLayout;
+import com.google.android.material.appbar.AppBarLayout;
public abstract class AppBarStateChangeListener implements AppBarLayout.OnOffsetChangedListener {
diff --git a/app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java b/app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java
index 7ad8b87d9..ac344efc3 100644
--- a/app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java
+++ b/app/src/main/java/com/yizhuan/erban/utils/BuglyFileProvider.java
@@ -1,6 +1,6 @@
package com.yizhuan.erban.utils;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
/**
* 使用的第三方库也配置了同样的FileProvider, 可以通过继承FileProvider类来解决合并冲突的问题
diff --git a/app/src/main/java/com/yizhuan/erban/utils/CertificateHelper.java b/app/src/main/java/com/yizhuan/erban/utils/CertificateHelper.java
index 5d2fa01a5..616135a47 100644
--- a/app/src/main/java/com/yizhuan/erban/utils/CertificateHelper.java
+++ b/app/src/main/java/com/yizhuan/erban/utils/CertificateHelper.java
@@ -1,8 +1,8 @@
package com.yizhuan.erban.utils;
import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.style.ForegroundColorSpan;
diff --git a/app/src/main/java/com/yizhuan/erban/utils/FontTextView.java b/app/src/main/java/com/yizhuan/erban/utils/FontTextView.java
index 99f331dd5..4c0a202fc 100644
--- a/app/src/main/java/com/yizhuan/erban/utils/FontTextView.java
+++ b/app/src/main/java/com/yizhuan/erban/utils/FontTextView.java
@@ -3,7 +3,7 @@ package com.yizhuan.erban.utils;
import android.content.Context;
import android.content.res.AssetManager;
import android.graphics.Typeface;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.appcompat.widget.AppCompatTextView;
import android.util.AttributeSet;
public class FontTextView extends AppCompatTextView {
diff --git a/app/src/main/java/com/yizhuan/erban/utils/NotificationsUtils.java b/app/src/main/java/com/yizhuan/erban/utils/NotificationsUtils.java
index ddb9eac2d..d1167228c 100644
--- a/app/src/main/java/com/yizhuan/erban/utils/NotificationsUtils.java
+++ b/app/src/main/java/com/yizhuan/erban/utils/NotificationsUtils.java
@@ -8,7 +8,7 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationManagerCompat;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
diff --git a/app/src/main/res/layout/act_community_notice.xml b/app/src/main/res/layout/act_community_notice.xml
index df6c91328..f578abea2 100644
--- a/app/src/main/res/layout/act_community_notice.xml
+++ b/app/src/main/res/layout/act_community_notice.xml
@@ -1,5 +1,5 @@
-
@@ -18,21 +18,21 @@
app:layout_constraintTop_toBottomOf="@id/title_bar"
app:layout_constraintBottom_toBottomOf="parent">
-
-
-
+
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_team_member.xml b/app/src/main/res/layout/activity_add_team_member.xml
index a6c57765c..e79b92772 100644
--- a/app/src/main/res/layout/activity_add_team_member.xml
+++ b/app/src/main/res/layout/activity_add_team_member.xml
@@ -113,7 +113,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
diff --git a/app/src/main/res/layout/activity_add_team_member_search_list.xml b/app/src/main/res/layout/activity_add_team_member_search_list.xml
index 67bbe6ef2..d9c6f8091 100644
--- a/app/src/main/res/layout/activity_add_team_member_search_list.xml
+++ b/app/src/main/res/layout/activity_add_team_member_search_list.xml
@@ -101,7 +101,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
diff --git a/app/src/main/res/layout/activity_bill_gift_income_group.xml b/app/src/main/res/layout/activity_bill_gift_income_group.xml
index 39fb806b0..0f09f8a27 100644
--- a/app/src/main/res/layout/activity_bill_gift_income_group.xml
+++ b/app/src/main/res/layout/activity_bill_gift_income_group.xml
@@ -24,7 +24,7 @@
android:layout_height="9dp"
android:background="@color/white"/>
-
-
-
-
+
diff --git a/app/src/main/res/layout/activity_bind_withdraw_bank_card.xml b/app/src/main/res/layout/activity_bind_withdraw_bank_card.xml
index 643d4b432..edd6f0f25 100644
--- a/app/src/main/res/layout/activity_bind_withdraw_bank_card.xml
+++ b/app/src/main/res/layout/activity_bind_withdraw_bank_card.xml
@@ -1,5 +1,5 @@
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_binder_phone.xml b/app/src/main/res/layout/activity_binder_phone.xml
index 5b88f0620..ca1ec02c4 100644
--- a/app/src/main/res/layout/activity_binder_phone.xml
+++ b/app/src/main/res/layout/activity_binder_phone.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/activity_charge.xml b/app/src/main/res/layout/activity_charge.xml
index 8b227e691..e1066bec8 100644
--- a/app/src/main/res/layout/activity_charge.xml
+++ b/app/src/main/res/layout/activity_charge.xml
@@ -52,7 +52,7 @@
tools:text="50" />
-
-
-
+
diff --git a/app/src/main/res/layout/activity_chat_room.xml b/app/src/main/res/layout/activity_chat_room.xml
index 2d8a7f8e6..db8d58624 100644
--- a/app/src/main/res/layout/activity_chat_room.xml
+++ b/app/src/main/res/layout/activity_chat_room.xml
@@ -18,7 +18,7 @@
android:layout_height="match_parent"
android:background="@color/black_transparent_30" />
-
-
-
-
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_create_pk.xml b/app/src/main/res/layout/activity_create_pk.xml
index 02196d475..2ee3cecbd 100644
--- a/app/src/main/res/layout/activity_create_pk.xml
+++ b/app/src/main/res/layout/activity_create_pk.xml
@@ -19,7 +19,7 @@
android:background="@color/color_FFFFFF"
android:orientation="horizontal">
-
-
+
-
-
+
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_erban_top_message.xml b/app/src/main/res/layout/activity_erban_top_message.xml
index 6c533c4c4..57fbb9561 100644
--- a/app/src/main/res/layout/activity_erban_top_message.xml
+++ b/app/src/main/res/layout/activity_erban_top_message.xml
@@ -17,18 +17,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
diff --git a/app/src/main/res/layout/activity_family_currency.xml b/app/src/main/res/layout/activity_family_currency.xml
index 82cb58a7a..98a505cce 100644
--- a/app/src/main/res/layout/activity_family_currency.xml
+++ b/app/src/main/res/layout/activity_family_currency.xml
@@ -15,17 +15,17 @@
-
-
-
+
diff --git a/app/src/main/res/layout/activity_family_game_list.xml b/app/src/main/res/layout/activity_family_game_list.xml
index 732f01ab0..526ae430a 100644
--- a/app/src/main/res/layout/activity_family_game_list.xml
+++ b/app/src/main/res/layout/activity_family_game_list.xml
@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
-
-
-
+
diff --git a/app/src/main/res/layout/activity_family_list.xml b/app/src/main/res/layout/activity_family_list.xml
index 32a65db4a..4907c72a6 100644
--- a/app/src/main/res/layout/activity_family_list.xml
+++ b/app/src/main/res/layout/activity_family_list.xml
@@ -16,19 +16,19 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
-
+
diff --git a/app/src/main/res/layout/activity_family_list_member.xml b/app/src/main/res/layout/activity_family_list_member.xml
index 13731d0aa..bf99adad5 100644
--- a/app/src/main/res/layout/activity_family_list_member.xml
+++ b/app/src/main/res/layout/activity_family_list_member.xml
@@ -93,16 +93,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
-
+
diff --git a/app/src/main/res/layout/activity_family_manage_activty.xml b/app/src/main/res/layout/activity_family_manage_activty.xml
index d5a1e300c..ac68f55ad 100644
--- a/app/src/main/res/layout/activity_family_manage_activty.xml
+++ b/app/src/main/res/layout/activity_family_manage_activty.xml
@@ -14,7 +14,7 @@
android:layout_height="wrap_content" />
-
diff --git a/app/src/main/res/layout/activity_family_member_currency.xml b/app/src/main/res/layout/activity_family_member_currency.xml
index c2794c501..8781b463a 100644
--- a/app/src/main/res/layout/activity_family_member_currency.xml
+++ b/app/src/main/res/layout/activity_family_member_currency.xml
@@ -14,17 +14,17 @@
android:layout_height="wrap_content" />
-
-
-
+
diff --git a/app/src/main/res/layout/activity_family_member_search.xml b/app/src/main/res/layout/activity_family_member_search.xml
index 0fd404dfb..789bf4b19 100644
--- a/app/src/main/res/layout/activity_family_member_search.xml
+++ b/app/src/main/res/layout/activity_family_member_search.xml
@@ -84,12 +84,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
+
diff --git a/app/src/main/res/layout/activity_family_plaza.xml b/app/src/main/res/layout/activity_family_plaza.xml
index 59535a322..576022a5e 100644
--- a/app/src/main/res/layout/activity_family_plaza.xml
+++ b/app/src/main/res/layout/activity_family_plaza.xml
@@ -13,12 +13,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
-
-
-
-
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_family_search.xml b/app/src/main/res/layout/activity_family_search.xml
index ed2f64670..5745d20d1 100644
--- a/app/src/main/res/layout/activity_family_search.xml
+++ b/app/src/main/res/layout/activity_family_search.xml
@@ -87,12 +87,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
+
diff --git a/app/src/main/res/layout/activity_family_select_friend.xml b/app/src/main/res/layout/activity_family_select_friend.xml
index b4e23ef99..7a9950688 100644
--- a/app/src/main/res/layout/activity_family_select_friend.xml
+++ b/app/src/main/res/layout/activity_family_select_friend.xml
@@ -18,7 +18,7 @@
android:layout_height="40dp"
android:layout_marginHorizontal="@dimen/dp_40"/>
-
diff --git a/app/src/main/res/layout/activity_fans.xml b/app/src/main/res/layout/activity_fans.xml
index 8cd92dae8..04e876a28 100644
--- a/app/src/main/res/layout/activity_fans.xml
+++ b/app/src/main/res/layout/activity_fans.xml
@@ -10,7 +10,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"/>
-
diff --git a/app/src/main/res/layout/activity_forget_psw.xml b/app/src/main/res/layout/activity_forget_psw.xml
index 000be3c10..90dc180df 100644
--- a/app/src/main/res/layout/activity_forget_psw.xml
+++ b/app/src/main/res/layout/activity_forget_psw.xml
@@ -1,5 +1,5 @@
-
-
-
+
diff --git a/app/src/main/res/layout/activity_friend_black_list_manage.xml b/app/src/main/res/layout/activity_friend_black_list_manage.xml
index b5fed103c..755e23634 100644
--- a/app/src/main/res/layout/activity_friend_black_list_manage.xml
+++ b/app/src/main/res/layout/activity_friend_black_list_manage.xml
@@ -6,7 +6,7 @@
android:background="@color/white"
android:orientation="vertical">
-
-
+
-
-
-
-
-
+
+
diff --git a/app/src/main/res/layout/activity_ktv_room_list.xml b/app/src/main/res/layout/activity_ktv_room_list.xml
index 9e8db631a..04ff73878 100644
--- a/app/src/main/res/layout/activity_ktv_room_list.xml
+++ b/app/src/main/res/layout/activity_ktv_room_list.xml
@@ -10,7 +10,7 @@
-
-
-
+
diff --git a/app/src/main/res/layout/activity_ktv_search_song.xml b/app/src/main/res/layout/activity_ktv_search_song.xml
index 0898521af..a7d1a07f7 100644
--- a/app/src/main/res/layout/activity_ktv_search_song.xml
+++ b/app/src/main/res/layout/activity_ktv_search_song.xml
@@ -135,13 +135,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
-
+
diff --git a/app/src/main/res/layout/activity_ktv_select_song.xml b/app/src/main/res/layout/activity_ktv_select_song.xml
index 601960d47..65ab228f3 100644
--- a/app/src/main/res/layout/activity_ktv_select_song.xml
+++ b/app/src/main/res/layout/activity_ktv_select_song.xml
@@ -70,13 +70,13 @@
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_16" />
-
-
-
+
-
+
diff --git a/app/src/main/res/layout/activity_ktv_song_list.xml b/app/src/main/res/layout/activity_ktv_song_list.xml
index 9d11b99a5..fc1b82642 100644
--- a/app/src/main/res/layout/activity_ktv_song_list.xml
+++ b/app/src/main/res/layout/activity_ktv_song_list.xml
@@ -33,13 +33,13 @@
android:layout_width="match_parent"
android:layout_height="@dimen/dp_10" />
-
-
-
+
-
+
diff --git a/app/src/main/res/layout/activity_list_attention.xml b/app/src/main/res/layout/activity_list_attention.xml
index a45fcfd2a..db27742e2 100644
--- a/app/src/main/res/layout/activity_list_attention.xml
+++ b/app/src/main/res/layout/activity_list_attention.xml
@@ -10,7 +10,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"/>
-
@@ -18,18 +18,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 53556a6f0..46d1ab52b 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,5 +1,5 @@
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_lucky_money_detail.xml b/app/src/main/res/layout/activity_lucky_money_detail.xml
index b6ab6355a..3ff79f461 100644
--- a/app/src/main/res/layout/activity_lucky_money_detail.xml
+++ b/app/src/main/res/layout/activity_lucky_money_detail.xml
@@ -109,14 +109,14 @@
android:layout_centerInParent="true"
tools:src="@drawable/default_user_head" />
-
-
-
-
-
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d7a5e7f05..9e56f061c 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/activity_modify_info.xml b/app/src/main/res/layout/activity_modify_info.xml
index 9dafd3fd6..410a663a5 100644
--- a/app/src/main/res/layout/activity_modify_info.xml
+++ b/app/src/main/res/layout/activity_modify_info.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_modify_pwd.xml b/app/src/main/res/layout/activity_modify_pwd.xml
index 45506499a..e0cb3e866 100644
--- a/app/src/main/res/layout/activity_modify_pwd.xml
+++ b/app/src/main/res/layout/activity_modify_pwd.xml
@@ -48,12 +48,12 @@
app:title_hint="确认密码"
app:hint="再次确认新的登录密码"/>
-
-
-
+
-
-
-
+
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_my_voice.xml b/app/src/main/res/layout/activity_my_voice.xml
index e091d630e..1b3aef1d4 100644
--- a/app/src/main/res/layout/activity_my_voice.xml
+++ b/app/src/main/res/layout/activity_my_voice.xml
@@ -30,7 +30,7 @@
android:layout_height="0dp"
android:layout_weight="1">
-
-
-
-
+
diff --git a/app/src/main/res/layout/activity_nim_add_black_list.xml b/app/src/main/res/layout/activity_nim_add_black_list.xml
index e9c6e0ab2..8be5df149 100644
--- a/app/src/main/res/layout/activity_nim_add_black_list.xml
+++ b/app/src/main/res/layout/activity_nim_add_black_list.xml
@@ -7,7 +7,7 @@
android:background="#f8f8f8"
android:orientation="vertical">
-
-
+
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_p2p_message.xml b/app/src/main/res/layout/activity_p2p_message.xml
index 146447f78..82bcffb47 100644
--- a/app/src/main/res/layout/activity_p2p_message.xml
+++ b/app/src/main/res/layout/activity_p2p_message.xml
@@ -13,14 +13,14 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
-
-
-
+
+
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_radish_record.xml b/app/src/main/res/layout/activity_radish_record.xml
index 8241f73c2..db1a5d7d8 100644
--- a/app/src/main/res/layout/activity_radish_record.xml
+++ b/app/src/main/res/layout/activity_radish_record.xml
@@ -63,7 +63,7 @@
-
diff --git a/app/src/main/res/layout/activity_record_for_pk.xml b/app/src/main/res/layout/activity_record_for_pk.xml
index 3cc90fd19..8819ea6aa 100644
--- a/app/src/main/res/layout/activity_record_for_pk.xml
+++ b/app/src/main/res/layout/activity_record_for_pk.xml
@@ -13,18 +13,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_recyclerview_bind.xml b/app/src/main/res/layout/activity_recyclerview_bind.xml
index 787cbfd53..804fecd2e 100644
--- a/app/src/main/res/layout/activity_recyclerview_bind.xml
+++ b/app/src/main/res/layout/activity_recyclerview_bind.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
-
-
-
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_red_packet_withdraw.xml b/app/src/main/res/layout/activity_red_packet_withdraw.xml
index 1e84607fb..ac95fbf9d 100644
--- a/app/src/main/res/layout/activity_red_packet_withdraw.xml
+++ b/app/src/main/res/layout/activity_red_packet_withdraw.xml
@@ -156,7 +156,7 @@
-
-
-
+
diff --git a/app/src/main/res/layout/activity_room_black_list.xml b/app/src/main/res/layout/activity_room_black_list.xml
index c9612485f..0f9a314f1 100644
--- a/app/src/main/res/layout/activity_room_black_list.xml
+++ b/app/src/main/res/layout/activity_room_black_list.xml
@@ -28,7 +28,7 @@
android:layout_height="match_parent"
>
-
diff --git a/app/src/main/res/layout/activity_room_invite.xml b/app/src/main/res/layout/activity_room_invite.xml
index d4cf2dd43..bcf786807 100644
--- a/app/src/main/res/layout/activity_room_invite.xml
+++ b/app/src/main/res/layout/activity_room_invite.xml
@@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
diff --git a/app/src/main/res/layout/activity_room_rank_list.xml b/app/src/main/res/layout/activity_room_rank_list.xml
index a8b341864..4d51c881c 100644
--- a/app/src/main/res/layout/activity_room_rank_list.xml
+++ b/app/src/main/res/layout/activity_room_rank_list.xml
@@ -88,13 +88,13 @@
-
-
+
diff --git a/app/src/main/res/layout/activity_room_setting.xml b/app/src/main/res/layout/activity_room_setting.xml
index 7839689b7..69f4bc51d 100644
--- a/app/src/main/res/layout/activity_room_setting.xml
+++ b/app/src/main/res/layout/activity_room_setting.xml
@@ -416,7 +416,7 @@
android:visibility="gone"
android:background="@color/line_color" />
-
-
+
-
-
+
diff --git a/app/src/main/res/layout/activity_scrolling.xml b/app/src/main/res/layout/activity_scrolling.xml
index 03c627257..8c307715e 100644
--- a/app/src/main/res/layout/activity_scrolling.xml
+++ b/app/src/main/res/layout/activity_scrolling.xml
@@ -1,5 +1,5 @@
-
-
-
-
-
-
+
+
-
-
+
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 8bf75f441..fc252f7ac 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -78,7 +78,7 @@
-
-
-
+
-
-
-
+
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_select_friend.xml b/app/src/main/res/layout/activity_select_friend.xml
index 3ce6ffbbc..63241e666 100644
--- a/app/src/main/res/layout/activity_select_friend.xml
+++ b/app/src/main/res/layout/activity_select_friend.xml
@@ -22,7 +22,7 @@
android:layout_height="36dp"
android:background="@color/white"/>
-
diff --git a/app/src/main/res/layout/activity_send_gold.xml b/app/src/main/res/layout/activity_send_gold.xml
index 842ff6d3c..ee4e9cbd1 100644
--- a/app/src/main/res/layout/activity_send_gold.xml
+++ b/app/src/main/res/layout/activity_send_gold.xml
@@ -1,5 +1,5 @@
-
-
-
-
+
-
-
+
@@ -208,4 +208,4 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_show_bind_phone.xml b/app/src/main/res/layout/activity_show_bind_phone.xml
index d01acfa71..36ff22987 100644
--- a/app/src/main/res/layout/activity_show_bind_phone.xml
+++ b/app/src/main/res/layout/activity_show_bind_phone.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/activity_show_photo.xml b/app/src/main/res/layout/activity_show_photo.xml
index 0c994a8db..fc613fefd 100644
--- a/app/src/main/res/layout/activity_show_photo.xml
+++ b/app/src/main/res/layout/activity_show_photo.xml
@@ -7,11 +7,11 @@
android:fitsSystemWindows="true"
android:clipToPadding="false"
tools:context="com.yizhuan.erban.ui.user.ShowPhotoActivity">
-
-
+
-
-
-
+
-
+
@@ -281,7 +281,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
-
-
+
diff --git a/app/src/main/res/layout/activity_task_center.xml b/app/src/main/res/layout/activity_task_center.xml
index aa44f7f5f..6d65d5b94 100644
--- a/app/src/main/res/layout/activity_task_center.xml
+++ b/app/src/main/res/layout/activity_task_center.xml
@@ -1,5 +1,5 @@
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_team_member_list.xml b/app/src/main/res/layout/activity_team_member_list.xml
index 4db7591d1..305e6d7c4 100644
--- a/app/src/main/res/layout/activity_team_member_list.xml
+++ b/app/src/main/res/layout/activity_team_member_list.xml
@@ -103,18 +103,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
diff --git a/app/src/main/res/layout/activity_team_member_search_list.xml b/app/src/main/res/layout/activity_team_member_search_list.xml
index 76316a70d..b9de4b059 100644
--- a/app/src/main/res/layout/activity_team_member_search_list.xml
+++ b/app/src/main/res/layout/activity_team_member_search_list.xml
@@ -98,13 +98,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
+
diff --git a/app/src/main/res/layout/activity_team_message.xml b/app/src/main/res/layout/activity_team_message.xml
index a87516f9e..2f26f3529 100644
--- a/app/src/main/res/layout/activity_team_message.xml
+++ b/app/src/main/res/layout/activity_team_message.xml
@@ -7,14 +7,14 @@
android:fitsSystemWindows="true"
android:orientation="vertical">
-
-
-
-
+
+
-
diff --git a/app/src/main/res/layout/activity_team_weekly_bill_search.xml b/app/src/main/res/layout/activity_team_weekly_bill_search.xml
index d3adf40b9..f363d2ebb 100644
--- a/app/src/main/res/layout/activity_team_weekly_bill_search.xml
+++ b/app/src/main/res/layout/activity_team_weekly_bill_search.xml
@@ -103,7 +103,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
diff --git a/app/src/main/res/layout/activity_update_team_name.xml b/app/src/main/res/layout/activity_update_team_name.xml
index c5e6c675a..af62e4bf6 100644
--- a/app/src/main/res/layout/activity_update_team_name.xml
+++ b/app/src/main/res/layout/activity_update_team_name.xml
@@ -7,7 +7,7 @@
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_user_guide.xml b/app/src/main/res/layout/activity_user_guide.xml
index f04ce9ef9..e13df1a9a 100644
--- a/app/src/main/res/layout/activity_user_guide.xml
+++ b/app/src/main/res/layout/activity_user_guide.xml
@@ -2,12 +2,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
-
+
-
+
diff --git a/app/src/main/res/layout/activity_user_info_modify.xml b/app/src/main/res/layout/activity_user_info_modify.xml
index 635e8c3b3..dc42ccf4a 100644
--- a/app/src/main/res/layout/activity_user_info_modify.xml
+++ b/app/src/main/res/layout/activity_user_info_modify.xml
@@ -173,7 +173,7 @@
android:textColor="@color/text_color_secondary"
android:textSize="@dimen/font_medium" />
-
diff --git a/app/src/main/res/layout/activity_voice_match.xml b/app/src/main/res/layout/activity_voice_match.xml
index fa1bfaa70..f896163de 100644
--- a/app/src/main/res/layout/activity_voice_match.xml
+++ b/app/src/main/res/layout/activity_voice_match.xml
@@ -1,5 +1,5 @@
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_wallet.xml b/app/src/main/res/layout/activity_wallet.xml
index 5d7160768..55cebd63d 100644
--- a/app/src/main/res/layout/activity_wallet.xml
+++ b/app/src/main/res/layout/activity_wallet.xml
@@ -23,7 +23,7 @@
android:layout_marginTop="@dimen/common_toolbar_height"
android:background="@color/white" />
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/common_toolbar_layout.xml b/app/src/main/res/layout/common_toolbar_layout.xml
index 275bd8b16..c2b608d95 100644
--- a/app/src/main/res/layout/common_toolbar_layout.xml
+++ b/app/src/main/res/layout/common_toolbar_layout.xml
@@ -1,6 +1,6 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_scrolling.xml b/app/src/main/res/layout/content_scrolling.xml
index 0c0c20567..f192f0471 100644
--- a/app/src/main/res/layout/content_scrolling.xml
+++ b/app/src/main/res/layout/content_scrolling.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/default_toolbar_layout.xml b/app/src/main/res/layout/default_toolbar_layout.xml
index d6c587d9b..3021e011b 100644
--- a/app/src/main/res/layout/default_toolbar_layout.xml
+++ b/app/src/main/res/layout/default_toolbar_layout.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_bottom_face.xml b/app/src/main/res/layout/dialog_bottom_face.xml
index b0703680f..5c7ff3bce 100644
--- a/app/src/main/res/layout/dialog_bottom_face.xml
+++ b/app/src/main/res/layout/dialog_bottom_face.xml
@@ -6,7 +6,7 @@
android:background="#dd0c0c0c"
android:orientation="vertical">
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_confirm_payment_select.xml b/app/src/main/res/layout/dialog_confirm_payment_select.xml
index 5e8c9be51..bff01c1fc 100644
--- a/app/src/main/res/layout/dialog_confirm_payment_select.xml
+++ b/app/src/main/res/layout/dialog_confirm_payment_select.xml
@@ -4,7 +4,7 @@
android:layout_height="200dp"
android:background="@drawable/bg_confirm_payment_select_way">
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ktv_commit_error.xml b/app/src/main/res/layout/dialog_ktv_commit_error.xml
index 7b03a91b1..bcd0e68c2 100644
--- a/app/src/main/res/layout/dialog_ktv_commit_error.xml
+++ b/app/src/main/res/layout/dialog_ktv_commit_error.xml
@@ -11,7 +11,7 @@
type="android.view.View.OnClickListener" />
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_ktv_select_song.xml b/app/src/main/res/layout/dialog_ktv_select_song.xml
index c4e9496b1..09b7fa76b 100644
--- a/app/src/main/res/layout/dialog_ktv_select_song.xml
+++ b/app/src/main/res/layout/dialog_ktv_select_song.xml
@@ -16,7 +16,7 @@
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_live_tag.xml b/app/src/main/res/layout/dialog_live_tag.xml
index 202c22155..bbf068797 100644
--- a/app/src/main/res/layout/dialog_live_tag.xml
+++ b/app/src/main/res/layout/dialog_live_tag.xml
@@ -15,7 +15,7 @@
android:gravity="center_horizontal"
android:background="@drawable/shape_white_20dp_round">
-
-
-
-
-
-
-
-
+
-
-
@@ -67,4 +67,4 @@
android:src="@drawable/icon_pm_close"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_pk_mic_queue.xml b/app/src/main/res/layout/dialog_pk_mic_queue.xml
index 588110e52..573356c00 100644
--- a/app/src/main/res/layout/dialog_pk_mic_queue.xml
+++ b/app/src/main/res/layout/dialog_pk_mic_queue.xml
@@ -44,17 +44,17 @@
android:layout_height="0dp"
android:layout_weight="1">
-
-
-
+
-
diff --git a/app/src/main/res/layout/dialog_pk_score_board.xml b/app/src/main/res/layout/dialog_pk_score_board.xml
index 8da442469..b6e75cff2 100644
--- a/app/src/main/res/layout/dialog_pk_score_board.xml
+++ b/app/src/main/res/layout/dialog_pk_score_board.xml
@@ -105,7 +105,7 @@
android:background="@color/color_FFFFFF"
android:orientation="horizontal">
-
-
+
-
-
+
-
diff --git a/app/src/main/res/layout/dialog_room_impose.xml b/app/src/main/res/layout/dialog_room_impose.xml
index 827e39ff1..9c67aa3e2 100644
--- a/app/src/main/res/layout/dialog_room_impose.xml
+++ b/app/src/main/res/layout/dialog_room_impose.xml
@@ -149,7 +149,7 @@
android:layout_width="match_parent"
android:layout_height="10dp" />
-
-
+
-
diff --git a/app/src/main/res/layout/dialog_user_info.xml b/app/src/main/res/layout/dialog_user_info.xml
index bf580f415..3e53f5bb1 100644
--- a/app/src/main/res/layout/dialog_user_info.xml
+++ b/app/src/main/res/layout/dialog_user_info.xml
@@ -110,7 +110,7 @@
android:orientation="horizontal"
tools:contentDescription="性别等级">
-
-
-
-
-
-
-
-
+
diff --git a/app/src/main/res/layout/face_gridview.xml b/app/src/main/res/layout/face_gridview.xml
index c41722869..9c95744b8 100644
--- a/app/src/main/res/layout/face_gridview.xml
+++ b/app/src/main/res/layout/face_gridview.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/family_attention_item.xml b/app/src/main/res/layout/family_attention_item.xml
index 472747a78..bdbfe87fc 100644
--- a/app/src/main/res/layout/family_attention_item.xml
+++ b/app/src/main/res/layout/family_attention_item.xml
@@ -41,7 +41,7 @@
android:textSize="15sp"
tools:text="我的" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_chatroom_game_main.xml b/app/src/main/res/layout/fragment_chatroom_game_main.xml
index 2b81900b0..52e310bea 100644
--- a/app/src/main/res/layout/fragment_chatroom_game_main.xml
+++ b/app/src/main/res/layout/fragment_chatroom_game_main.xml
@@ -87,7 +87,7 @@
android:layout_toEndOf="@id/room_back"
android:orientation="horizontal">
-
-
-
-
-
@@ -128,7 +128,7 @@
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15">
-
@@ -281,7 +281,7 @@
android:textSize="18sp"
android:textStyle="bold" />
-
@@ -298,7 +298,7 @@
android:paddingLeft="20dp"
android:paddingRight="20dp">
-
@@ -410,8 +410,8 @@
-
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_family_attention.xml b/app/src/main/res/layout/fragment_family_attention.xml
index de2b1f271..e959c7f37 100644
--- a/app/src/main/res/layout/fragment_family_attention.xml
+++ b/app/src/main/res/layout/fragment_family_attention.xml
@@ -7,18 +7,18 @@
android:background="@color/color_F5F5F5"
android:layout_height="match_parent">
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_family_fans_list.xml b/app/src/main/res/layout/fragment_family_fans_list.xml
index 59333439b..3e5b69f6d 100644
--- a/app/src/main/res/layout/fragment_family_fans_list.xml
+++ b/app/src/main/res/layout/fragment_family_fans_list.xml
@@ -9,19 +9,19 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
diff --git a/app/src/main/res/layout/fragment_family_friend_list.xml b/app/src/main/res/layout/fragment_family_friend_list.xml
index 0d8f5d666..dc8ed9471 100644
--- a/app/src/main/res/layout/fragment_family_friend_list.xml
+++ b/app/src/main/res/layout/fragment_family_friend_list.xml
@@ -4,18 +4,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_fans_list.xml b/app/src/main/res/layout/fragment_fans_list.xml
index 856e518af..646f4729d 100644
--- a/app/src/main/res/layout/fragment_fans_list.xml
+++ b/app/src/main/res/layout/fragment_fans_list.xml
@@ -4,17 +4,17 @@
android:layout_height="match_parent"
android:background="@color/white">
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_find.xml b/app/src/main/res/layout/fragment_find.xml
index c87d7573b..98c3f24e4 100644
--- a/app/src/main/res/layout/fragment_find.xml
+++ b/app/src/main/res/layout/fragment_find.xml
@@ -6,12 +6,12 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
-
-
-
-
+
-
-
+
-
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_find_tab.xml b/app/src/main/res/layout/fragment_find_tab.xml
index 738d11ade..a96ea0d69 100644
--- a/app/src/main/res/layout/fragment_find_tab.xml
+++ b/app/src/main/res/layout/fragment_find_tab.xml
@@ -1,16 +1,16 @@
-
-
-
-
+
-
-
+
-
+
diff --git a/app/src/main/res/layout/fragment_game_home.xml b/app/src/main/res/layout/fragment_game_home.xml
index 2086fbd21..ae01498d4 100644
--- a/app/src/main/res/layout/fragment_game_home.xml
+++ b/app/src/main/res/layout/fragment_game_home.xml
@@ -15,14 +15,14 @@
type="Boolean" />
-
-
-
-
@@ -87,7 +87,7 @@
app:layout_constraintStart_toStartOf="parent"
/>
-
-
-
-
+
-
-
-
+
-
+
-
+
-
+
-
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_gift_income.xml b/app/src/main/res/layout/fragment_gift_income.xml
index 49c9051df..a3b3ad57e 100644
--- a/app/src/main/res/layout/fragment_gift_income.xml
+++ b/app/src/main/res/layout/fragment_gift_income.xml
@@ -15,18 +15,18 @@
android:layout_height="match_parent"
android:layout_below="@+id/rly_date_out">
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home_other_tab.xml b/app/src/main/res/layout/fragment_home_other_tab.xml
index 87e6df0f9..165de8bbc 100644
--- a/app/src/main/res/layout/fragment_home_other_tab.xml
+++ b/app/src/main/res/layout/fragment_home_other_tab.xml
@@ -5,7 +5,7 @@
android:id="@+id/smart_refresh_layout"
tools:context="com.yizhuan.erban.home.fragment.HomeOtherTabFragment">
-
-
-
-
-
+
diff --git a/app/src/main/res/layout/fragment_hottest_ktv.xml b/app/src/main/res/layout/fragment_hottest_ktv.xml
index 52f4cdf89..7e927db1d 100644
--- a/app/src/main/res/layout/fragment_hottest_ktv.xml
+++ b/app/src/main/res/layout/fragment_hottest_ktv.xml
@@ -4,12 +4,12 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_ktv.xml b/app/src/main/res/layout/fragment_ktv.xml
index 9ffaf17c0..7af331331 100644
--- a/app/src/main/res/layout/fragment_ktv.xml
+++ b/app/src/main/res/layout/fragment_ktv.xml
@@ -10,7 +10,7 @@
android:layout_height="40dp"
android:background="@color/white" />
-
-
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index f9dd7c9e9..6d79213f1 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -78,7 +78,7 @@
/>
-
-
-
-
-
+
-
+
-
-
+
diff --git a/app/src/main/res/layout/fragment_msg.xml b/app/src/main/res/layout/fragment_msg.xml
index 4623b62b9..c8bf0aad3 100644
--- a/app/src/main/res/layout/fragment_msg.xml
+++ b/app/src/main/res/layout/fragment_msg.xml
@@ -13,7 +13,7 @@
android:paddingRight="5dp"
android:background="@color/color_FAFAFA" />
-
-
-
-
+
-
+
diff --git a/app/src/main/res/layout/fragment_newest_ktv.xml b/app/src/main/res/layout/fragment_newest_ktv.xml
index 54331c0a3..539e2c934 100644
--- a/app/src/main/res/layout/fragment_newest_ktv.xml
+++ b/app/src/main/res/layout/fragment_newest_ktv.xml
@@ -5,12 +5,12 @@
android:background="@color/color_F5F5F5"
android:orientation="vertical">
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_radish_record.xml b/app/src/main/res/layout/fragment_radish_record.xml
index 3163dea67..2e048b1e6 100644
--- a/app/src/main/res/layout/fragment_radish_record.xml
+++ b/app/src/main/res/layout/fragment_radish_record.xml
@@ -17,7 +17,7 @@
android:layout_height="@dimen/bill_item_time"
android:layout_below="@+id/title_bar" />
-
diff --git a/app/src/main/res/layout/fragment_recent_contacts.xml b/app/src/main/res/layout/fragment_recent_contacts.xml
index 261ee36ff..36213df9f 100644
--- a/app/src/main/res/layout/fragment_recent_contacts.xml
+++ b/app/src/main/res/layout/fragment_recent_contacts.xml
@@ -7,7 +7,7 @@
android:clickable="true"
android:focusable="true">
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_recommend_card.xml b/app/src/main/res/layout/fragment_recommend_card.xml
index 054ea32c4..1a14c6175 100644
--- a/app/src/main/res/layout/fragment_recommend_card.xml
+++ b/app/src/main/res/layout/fragment_recommend_card.xml
@@ -1,5 +1,5 @@
-
@@ -9,4 +9,4 @@
android:layout_height="match_parent">
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_recommendation.xml b/app/src/main/res/layout/fragment_recommendation.xml
index 83ab17d3a..e90399a6a 100644
--- a/app/src/main/res/layout/fragment_recommendation.xml
+++ b/app/src/main/res/layout/fragment_recommendation.xml
@@ -23,7 +23,7 @@
-
diff --git a/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml b/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml
index dd31c371e..431db4de9 100644
--- a/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml
+++ b/app/src/main/res/layout/fragment_recycler_view_bind_no_bg.xml
@@ -13,13 +13,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
-
+
-
-
-
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_room_category.xml b/app/src/main/res/layout/fragment_room_category.xml
index c40c80e49..2f2689738 100644
--- a/app/src/main/res/layout/fragment_room_category.xml
+++ b/app/src/main/res/layout/fragment_room_category.xml
@@ -16,7 +16,7 @@
-
diff --git a/app/src/main/res/layout/fragment_room_charm_list.xml b/app/src/main/res/layout/fragment_room_charm_list.xml
index e7eee0605..30358eb9b 100644
--- a/app/src/main/res/layout/fragment_room_charm_list.xml
+++ b/app/src/main/res/layout/fragment_room_charm_list.xml
@@ -21,7 +21,7 @@
-
diff --git a/app/src/main/res/layout/fragment_room_charm_ranking_list.xml b/app/src/main/res/layout/fragment_room_charm_ranking_list.xml
index 58e433042..43eac6680 100644
--- a/app/src/main/res/layout/fragment_room_charm_ranking_list.xml
+++ b/app/src/main/res/layout/fragment_room_charm_ranking_list.xml
@@ -9,12 +9,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
+
diff --git a/app/src/main/res/layout/fragment_room_contribute.xml b/app/src/main/res/layout/fragment_room_contribute.xml
index 4d2ec5717..119ae1ba9 100644
--- a/app/src/main/res/layout/fragment_room_contribute.xml
+++ b/app/src/main/res/layout/fragment_room_contribute.xml
@@ -18,7 +18,7 @@
-
diff --git a/app/src/main/res/layout/fragment_room_list.xml b/app/src/main/res/layout/fragment_room_list.xml
index a9ae3bb0a..9d723be9f 100644
--- a/app/src/main/res/layout/fragment_room_list.xml
+++ b/app/src/main/res/layout/fragment_room_list.xml
@@ -4,17 +4,17 @@
android:layout_height="match_parent"
android:background="@color/white">
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_room_rank_half_hour.xml b/app/src/main/res/layout/fragment_room_rank_half_hour.xml
index 0d67e1af7..e9bea0184 100644
--- a/app/src/main/res/layout/fragment_room_rank_half_hour.xml
+++ b/app/src/main/res/layout/fragment_room_rank_half_hour.xml
@@ -180,7 +180,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
diff --git a/app/src/main/res/layout/fragment_room_rank_list.xml b/app/src/main/res/layout/fragment_room_rank_list.xml
index 6260b6469..f7267dc5b 100644
--- a/app/src/main/res/layout/fragment_room_rank_list.xml
+++ b/app/src/main/res/layout/fragment_room_rank_list.xml
@@ -75,13 +75,13 @@
-
-
+
diff --git a/app/src/main/res/layout/fragment_task_center.xml b/app/src/main/res/layout/fragment_task_center.xml
index 948593a38..55127f910 100644
--- a/app/src/main/res/layout/fragment_task_center.xml
+++ b/app/src/main/res/layout/fragment_task_center.xml
@@ -8,17 +8,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_team_list.xml b/app/src/main/res/layout/fragment_team_list.xml
index ebadee003..37a3397e6 100644
--- a/app/src/main/res/layout/fragment_team_list.xml
+++ b/app/src/main/res/layout/fragment_team_list.xml
@@ -12,19 +12,19 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_user_info.xml b/app/src/main/res/layout/fragment_user_info.xml
index ebb2009e1..86c248a72 100644
--- a/app/src/main/res/layout/fragment_user_info.xml
+++ b/app/src/main/res/layout/fragment_user_info.xml
@@ -1,5 +1,5 @@
-
-
diff --git a/app/src/main/res/layout/fragment_voice_status.xml b/app/src/main/res/layout/fragment_voice_status.xml
index b4369cf46..b61a50e2c 100644
--- a/app/src/main/res/layout/fragment_voice_status.xml
+++ b/app/src/main/res/layout/fragment_voice_status.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_voice_status_loading.xml b/app/src/main/res/layout/fragment_voice_status_loading.xml
index cf34b0b82..dd490427f 100644
--- a/app/src/main/res/layout/fragment_voice_status_loading.xml
+++ b/app/src/main/res/layout/fragment_voice_status_loading.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_xrexylerview.xml b/app/src/main/res/layout/fragment_xrexylerview.xml
index e7840b709..e1aeac915 100644
--- a/app/src/main/res/layout/fragment_xrexylerview.xml
+++ b/app/src/main/res/layout/fragment_xrexylerview.xml
@@ -9,19 +9,19 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/frg_decoration_send_list.xml b/app/src/main/res/layout/frg_decoration_send_list.xml
index 5e5e3d7ab..a334da030 100644
--- a/app/src/main/res/layout/frg_decoration_send_list.xml
+++ b/app/src/main/res/layout/frg_decoration_send_list.xml
@@ -4,17 +4,17 @@
android:layout_height="match_parent"
android:background="@color/color_FAFAFA">
-
-
-
+
diff --git a/app/src/main/res/layout/frg_gift_group.xml b/app/src/main/res/layout/frg_gift_group.xml
index ad6dca37c..4a84d8299 100644
--- a/app/src/main/res/layout/frg_gift_group.xml
+++ b/app/src/main/res/layout/frg_gift_group.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/frg_my_decoration_common.xml b/app/src/main/res/layout/frg_my_decoration_common.xml
index 19976efe0..b2c0c3ae6 100644
--- a/app/src/main/res/layout/frg_my_decoration_common.xml
+++ b/app/src/main/res/layout/frg_my_decoration_common.xml
@@ -10,14 +10,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/gift_achievement_recyclerview.xml b/app/src/main/res/layout/gift_achievement_recyclerview.xml
index 59adeabbe..3d3de8373 100644
--- a/app/src/main/res/layout/gift_achievement_recyclerview.xml
+++ b/app/src/main/res/layout/gift_achievement_recyclerview.xml
@@ -1,6 +1,6 @@
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_sign_in_anmi_layout.xml b/app/src/main/res/layout/include_sign_in_anmi_layout.xml
index fc58d2777..8e316be92 100644
--- a/app/src/main/res/layout/include_sign_in_anmi_layout.xml
+++ b/app/src/main/res/layout/include_sign_in_anmi_layout.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_add_team_member.xml b/app/src/main/res/layout/item_add_team_member.xml
index 11b4030cb..ea1f77aac 100644
--- a/app/src/main/res/layout/item_add_team_member.xml
+++ b/app/src/main/res/layout/item_add_team_member.xml
@@ -36,14 +36,14 @@
avatarUrl="@{memberInfo.icon}"
tools:src="@drawable/default_user_head" />
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_banner.xml b/app/src/main/res/layout/item_banner.xml
index 01e6cc2d0..27353aa89 100644
--- a/app/src/main/res/layout/item_banner.xml
+++ b/app/src/main/res/layout/item_banner.xml
@@ -38,7 +38,7 @@
android:layout_weight="1"
app:hw_ratio="0.39">
-
-
-
@@ -260,5 +260,5 @@
android:textSize="9dp" />
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_family_member_list.xml b/app/src/main/res/layout/item_family_member_list.xml
index 47c45719e..52a3e9d8d 100644
--- a/app/src/main/res/layout/item_family_member_list.xml
+++ b/app/src/main/res/layout/item_family_member_list.xml
@@ -77,7 +77,7 @@
android:visibility="visible"
android:src="@drawable/ic_gender_female" />
-
-
-
diff --git a/app/src/main/res/layout/item_gift_achievement.xml b/app/src/main/res/layout/item_gift_achievement.xml
index bca3918ba..df8d5c108 100644
--- a/app/src/main/res/layout/item_gift_achievement.xml
+++ b/app/src/main/res/layout/item_gift_achievement.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_home_dynamic.xml b/app/src/main/res/layout/item_home_dynamic.xml
index b0eddf5a2..cabdf55dd 100644
--- a/app/src/main/res/layout/item_home_dynamic.xml
+++ b/app/src/main/res/layout/item_home_dynamic.xml
@@ -11,7 +11,7 @@
android:background="@drawable/bg_corner_shadow_12">
-
+
diff --git a/app/src/main/res/layout/item_home_hall_left.xml b/app/src/main/res/layout/item_home_hall_left.xml
index 6bda431ce..9d27a226b 100644
--- a/app/src/main/res/layout/item_home_hall_left.xml
+++ b/app/src/main/res/layout/item_home_hall_left.xml
@@ -52,7 +52,7 @@
android:visibility="gone"
tools:visibility="visible" />
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/item_home_play.xml b/app/src/main/res/layout/item_home_play.xml
index 738c4886b..9804796f5 100644
--- a/app/src/main/res/layout/item_home_play.xml
+++ b/app/src/main/res/layout/item_home_play.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_home_two_single_show.xml b/app/src/main/res/layout/item_home_two_single_show.xml
index ce94e9f76..bc248c361 100644
--- a/app/src/main/res/layout/item_home_two_single_show.xml
+++ b/app/src/main/res/layout/item_home_two_single_show.xml
@@ -25,7 +25,7 @@
android:src="@drawable/default_avatar"
app:riv_corner_radius="@dimen/dp_16" />
-
@@ -66,7 +66,7 @@
android:textSize="13sp"
tools:text="100" />
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_send.xml b/app/src/main/res/layout/item_send.xml
index 45fe9b862..d9836cb6b 100644
--- a/app/src/main/res/layout/item_send.xml
+++ b/app/src/main/res/layout/item_send.xml
@@ -40,7 +40,7 @@
app:layout_flexShrink="1"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -52,7 +52,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
- -->
-
+
-
-
-
+
-
-
+
-
diff --git a/app/src/main/res/layout/layout_desc_game.xml b/app/src/main/res/layout/layout_desc_game.xml
index 19b4c2a2f..18c6e6558 100644
--- a/app/src/main/res/layout/layout_desc_game.xml
+++ b/app/src/main/res/layout/layout_desc_game.xml
@@ -17,7 +17,7 @@
android:textSize="15sp"
android:visibility="gone" />
-
diff --git a/app/src/main/res/layout/layout_desc_tag.xml b/app/src/main/res/layout/layout_desc_tag.xml
index 86b00cb18..4051c9dda 100644
--- a/app/src/main/res/layout/layout_desc_tag.xml
+++ b/app/src/main/res/layout/layout_desc_tag.xml
@@ -41,7 +41,7 @@
android:textSize="12sp" />
-
-
-
-
--->
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_item_voice_bottle.xml b/app/src/main/res/layout/layout_item_voice_bottle.xml
index fe080832f..f361379b6 100644
--- a/app/src/main/res/layout/layout_item_voice_bottle.xml
+++ b/app/src/main/res/layout/layout_item_voice_bottle.xml
@@ -19,7 +19,7 @@
android:scaleType="fitCenter"
/>
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_ktv_choose_song.xml b/app/src/main/res/layout/layout_ktv_choose_song.xml
index 08009d781..bd8ed3d14 100644
--- a/app/src/main/res/layout/layout_ktv_choose_song.xml
+++ b/app/src/main/res/layout/layout_ktv_choose_song.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/layout_ktv_command.xml b/app/src/main/res/layout/layout_ktv_command.xml
index b186ced8f..06ff3cf32 100644
--- a/app/src/main/res/layout/layout_ktv_command.xml
+++ b/app/src/main/res/layout/layout_ktv_command.xml
@@ -1,5 +1,5 @@
-
-
-
+
-
-
+
-
-
+
diff --git a/app/src/main/res/layout/layout_ktv_prepare.xml b/app/src/main/res/layout/layout_ktv_prepare.xml
index 26e65fa80..0657e4cfc 100644
--- a/app/src/main/res/layout/layout_ktv_prepare.xml
+++ b/app/src/main/res/layout/layout_ktv_prepare.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/main/res/layout/layout_micro_view.xml b/app/src/main/res/layout/layout_micro_view.xml
index 47cea98de..5d6482499 100644
--- a/app/src/main/res/layout/layout_micro_view.xml
+++ b/app/src/main/res/layout/layout_micro_view.xml
@@ -27,7 +27,7 @@
android:layout_marginRight="@dimen/dp_12"
android:visibility="gone" />
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_recommend_topic_header.xml b/app/src/main/res/layout/layout_recommend_topic_header.xml
index c3119b13a..ece7a89a0 100644
--- a/app/src/main/res/layout/layout_recommend_topic_header.xml
+++ b/app/src/main/res/layout/layout_recommend_topic_header.xml
@@ -1,5 +1,5 @@
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_rollpage_view.xml b/app/src/main/res/layout/layout_rollpage_view.xml
index 7f5668521..ededb294a 100644
--- a/app/src/main/res/layout/layout_rollpage_view.xml
+++ b/app/src/main/res/layout/layout_rollpage_view.xml
@@ -38,7 +38,7 @@
android:layout_weight="1"
app:hw_ratio="0.39">
-
-
-
-
diff --git a/app/src/main/res/layout/layout_user_magic_wall.xml b/app/src/main/res/layout/layout_user_magic_wall.xml
index a202474d7..cef6bb673 100644
--- a/app/src/main/res/layout/layout_user_magic_wall.xml
+++ b/app/src/main/res/layout/layout_user_magic_wall.xml
@@ -34,7 +34,7 @@
android:textSize="13sp"
tools:text="(0)" />
-
-
-
+
-
-
+
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_home_hall.xml b/app/src/main/res/layout/list_item_home_hall.xml
index 67f84e43a..2c18f90ea 100644
--- a/app/src/main/res/layout/list_item_home_hall.xml
+++ b/app/src/main/res/layout/list_item_home_hall.xml
@@ -71,7 +71,7 @@
tools:visibility="visible"
tools:text="新消息：最多六个字...在公聊大厅@你" />
-
-
-
-
-
-
-->
-
diff --git a/app/src/main/res/layout/list_item_room_consume.xml b/app/src/main/res/layout/list_item_room_consume.xml
index e48b687eb..6f1b84798 100644
--- a/app/src/main/res/layout/list_item_room_consume.xml
+++ b/app/src/main/res/layout/list_item_room_consume.xml
@@ -92,7 +92,7 @@
android:layout_width="13dp"
android:layout_height="13dp" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/vs_task_center_start_tips.xml b/app/src/main/res/layout/vs_task_center_start_tips.xml
index 24eca269f..5eb284991 100644
--- a/app/src/main/res/layout/vs_task_center_start_tips.xml
+++ b/app/src/main/res/layout/vs_task_center_start_tips.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xhdpi/ic_home_ranking.png b/app/src/main/res/mipmap-xhdpi/ic_home_ranking.png
index be4d42876be22f98a1e1d05c7028ca2288149831..e37fee76574f831acde7aca3e04be31cf66c09d9 100644
GIT binary patch
literal 1778
zcmeHH`#Tc~0G&LR$7oaT*Cn@$BJ<9?xnVA&m~Bm|T#sg$MGZ}i5s4m>T4AFsq^?J?
zHSf(c$!^}XVR^JjB%?Bq>+iVVJ>PfE`OdHBeBa4Ldb@*^epLbh03d`19JS-*9Xjlm
z-O+r~?R)@0<~{N_#%(8V|BwG-1FG%!I6LbyVo=^_fQ+o1yn+fyRc#L#qVdaq%>&xM
z>*(qo);Bm}2sJV`F*P%{IBE&AvbM3cvv+hl=Ir9?=8o_>f%HY6#QL4~KXW$ZJT4R;
z9!b1Jij5=3Q<9RYY3bK8GP7>oxl7BVGaeN)OP-cjR902LtYyEdYiMra@>;vPd*1Tj
z_4SXA354U5AEstzKZ@r*e_34my8LZLvikkU&vog><`#!oMFark3=wc=%&E4HJZZ=P
zW^Y$bEVE6it>PY5_(VeMMlw@1v{YoKl`&=xmJ#yw#$q(|DHtXS0n4+lf6|)V9x4zX
z?w!`_sqJlU5zgrKmVFnJ{-Gcs<-DA}s&9(l!iq%5BfY~
zg5V`9I9iHT+6&idBh7uOLKm2>Ny6yTLJIIyT>a$8RV&hG_`#5H
zZM@wA3v}qj0?!6Mm(_k&2_fsAIS}nMmrj%xO^%sH_jA6s`f#U84p3yO5ah-spV9ok
z7LR^QmU#f#*nmZ^czGw~kw?>}0_JVB5{J$F8BkV52bH8ay@gm5?_UE4I_B>#bc0IX
zQ9lM4n2TbUg$$y|(liOkZ%+ZaQ_*i@DU%nh7f>l+@qF65e4xex$BqYWwpLJSNxaiW
zJc%J&DL8nL{WpW=*2}}!iUpk2=iDJXf%SIRxKE)*l|fdqD>|}P1zk&O+jMM=fQVSW
z0$=fL(d21>lLoEn23J~>_3Sk)Z})2)YAMz
z{&i`B7Z?0N96FFX5!3wCnWahM14Fmgh<8Q7gK^3>F>j{m9e(EqBz_xl;YlBrzLpYd
ziitP(QK7y9oM>0Ul}+JXUgeh@Yd-994W6T4NNO;o^92{nm~0?6GTe-T(&y#+3cR@E
zWv`JA%8Anf1nPJQ-M{x42;2(YZ4ykuY^#zVOgVK*R|$)^x_P0%zq1squ&5BFXssVO
z`=DfHj``3DEV79jac1i~ie)Z8u?&sA`C9nLuBe2$u_;A(#yq>y06&mQfYj}!sQs{t
zpvZG{6CRgbtd2C`bz=J0rj0St=IqZ=d+HeY8MXS6mkbNsvc8KeJWG`Sq+Wd_gNqLm
zBu(UAPS`ixz|3`F1@!}XCm%yRfR_#qwic~#-yHjt3OiMtJ|q$8+_xZ7_yeUZ(MXgK
zm$89XRf|+`uoKU!4-}nsxjJY7^B8?k()2y2r@!k$hn=?dF~hwUgzlie;Tpd!rA^5-
z_ANQhiQmFX<6?EntMH8<~bkTX+z|$E=*4bKlk$Th-#EaY}
zeKoixIy=?)A;>)V*l{>2g&%(VwWg~Oq
zEBtz{!-8`>(?`o)_E40o~-h`WFp^{JGXfy9Ggi4@7I!`)%|J
z&ZzoE-gq3^wiZVh&_S0;CXFHVURv+0y}>uYxLvzNvKkhc
z=;4WKQFVP2A8tGA)zn3!b!Ev`d8%a>M%-U*Lq#m>HV5O1*IRzD=HVqab`~D$Tk^)t
Wg+tr#&zbDp8vx@BejO|Lgwd=I7@R@;|b6{cs*!w7(MAUTm?F@$TTaInwfP&ISPe81(3W+BMYSW-
zJQKVROIJnZ_b6v~;<1H}hmDSvIKMW2jHqoNmWD~=#D1+B{b?FNJK-g4UYjq%J3Sz}
zAA|RMYW4PEK1U7L>+1$N^Cm8z5zzjn-f%8MZquz`&Nw9r9j(1#sCrFL$`QFVUo
z1;;%eD{K8C?NobX<&xWFMCQ(IO-7bp_N1h}J$P6?JQevmV$8XcB|#
Y0ln4w<;$2A7XSbN07*qoM6N<$f^~nGTmS$7
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 79c1a29a6..188829bbe 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -228,34 +228,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/model_customer_server/java/com/yizhuan/xchat_android_core/customer_server/CustomerServerModel.java b/app/src/model_customer_server/java/com/yizhuan/xchat_android_core/customer_server/CustomerServerModel.java
index 78efa9ad4..a4532373f 100644
--- a/app/src/model_customer_server/java/com/yizhuan/xchat_android_core/customer_server/CustomerServerModel.java
+++ b/app/src/model_customer_server/java/com/yizhuan/xchat_android_core/customer_server/CustomerServerModel.java
@@ -4,15 +4,12 @@ import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.util.Log;
-import android.view.View;
+import androidx.annotation.Nullable;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.transition.Transition;
import com.google.gson.Gson;
-import com.netease.nimlib.sdk.NIMSDK;
import com.qiyukf.unicorn.api.ConsultSource;
import com.qiyukf.unicorn.api.ImageLoaderListener;
import com.qiyukf.unicorn.api.UICustomization;
@@ -26,7 +23,6 @@ import com.qiyukf.unicorn.api.customization.action.ImageAction;
import com.qiyukf.unicorn.api.customization.input.ActionListProvider;
import com.qiyukf.unicorn.api.customization.input.ActionPanelOptions;
import com.qiyukf.unicorn.api.customization.input.InputPanelOptions;
-import com.qiyukf.unicorn.api.msg.MsgTypeEnum;
import com.qiyukf.unicorn.api.msg.OnPushMessageListener;
import com.qiyukf.unicorn.api.msg.PushMessageExtension;
import com.qiyukf.unicorn.api.msg.UnicornMessage;
diff --git a/app/src/model_customer_server/res/layout/activity_login_code.xml b/app/src/model_customer_server/res/layout/activity_login_code.xml
index e9dc65b98..d708c8b41 100644
--- a/app/src/model_customer_server/res/layout/activity_login_code.xml
+++ b/app/src/model_customer_server/res/layout/activity_login_code.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/model_customer_server/res/layout/activity_login_phone.xml b/app/src/model_customer_server/res/layout/activity_login_phone.xml
index 40006be18..6c4df613b 100644
--- a/app/src/model_customer_server/res/layout/activity_login_phone.xml
+++ b/app/src/model_customer_server/res/layout/activity_login_phone.xml
@@ -1,5 +1,5 @@
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_album/java/com/zhihu/matisse/Matisse.java b/app/src/module_album/java/com/zhihu/matisse/Matisse.java
index f5e6f9cc1..546738cfb 100644
--- a/app/src/module_album/java/com/zhihu/matisse/Matisse.java
+++ b/app/src/module_album/java/com/zhihu/matisse/Matisse.java
@@ -18,11 +18,10 @@ package com.zhihu.matisse;
import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
import com.zhihu.matisse.internal.entity.CustomItem;
-import com.zhihu.matisse.internal.entity.Item;
import com.zhihu.matisse.ui.MatisseActivity;
import java.lang.ref.WeakReference;
diff --git a/app/src/module_album/java/com/zhihu/matisse/MimeType.java b/app/src/module_album/java/com/zhihu/matisse/MimeType.java
index 6c002383f..48b7bd237 100644
--- a/app/src/module_album/java/com/zhihu/matisse/MimeType.java
+++ b/app/src/module_album/java/com/zhihu/matisse/MimeType.java
@@ -18,7 +18,7 @@ package com.zhihu.matisse;
import android.content.ContentResolver;
import android.net.Uri;
-import android.support.v4.util.ArraySet;
+import androidx.collection.ArraySet;
import android.text.TextUtils;
import android.webkit.MimeTypeMap;
diff --git a/app/src/module_album/java/com/zhihu/matisse/SelectionCreator.java b/app/src/module_album/java/com/zhihu/matisse/SelectionCreator.java
index cd85a8108..9c3d3ee24 100644
--- a/app/src/module_album/java/com/zhihu/matisse/SelectionCreator.java
+++ b/app/src/module_album/java/com/zhihu/matisse/SelectionCreator.java
@@ -19,12 +19,12 @@ package com.zhihu.matisse;
import android.app.Activity;
import android.content.Intent;
import android.os.Build;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.StyleRes;
-import android.support.v4.app.Fragment;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.StyleRes;
+import androidx.fragment.app.Fragment;
import com.zhihu.matisse.engine.ImageEngine;
import com.zhihu.matisse.filter.Filter;
@@ -238,7 +238,7 @@ public final class SelectionCreator {
/**
* Capture strategy provided for the location to save photos including internal and external
- * storage and also a authority for {@link android.support.v4.content.FileProvider}.
+ * storage and also a authority for {@link androidx.core.content.FileProvider}.
*
* @param captureStrategy {@link CaptureStrategy}, needed only when capturing is enabled.
* @return {@link SelectionCreator} for fluent API.
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/entity/Album.java b/app/src/module_album/java/com/zhihu/matisse/internal/entity/Album.java
index 6851fe01c..d08aef970 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/Album.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/entity/Album.java
@@ -21,7 +21,7 @@ import android.database.Cursor;
import android.os.Parcel;
import android.os.Parcelable;
import android.provider.MediaStore;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.yizhuan.erban.R;
import com.zhihu.matisse.internal.loader.AlbumLoader;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/entity/IncapableCause.java b/app/src/module_album/java/com/zhihu/matisse/internal/entity/IncapableCause.java
index 5c3920693..ff5ec46fd 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/IncapableCause.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/entity/IncapableCause.java
@@ -16,8 +16,8 @@
package com.zhihu.matisse.internal.entity;
import android.content.Context;
-import android.support.annotation.IntDef;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.IntDef;
+import androidx.fragment.app.FragmentActivity;
import android.widget.Toast;
import com.zhihu.matisse.internal.ui.widget.IncapableDialog;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/entity/Item.java b/app/src/module_album/java/com/zhihu/matisse/internal/entity/Item.java
index 0ef0b9839..62f3ec259 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/Item.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/entity/Item.java
@@ -22,7 +22,7 @@ import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
import android.provider.MediaStore;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.zhihu.matisse.MimeType;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/entity/SelectionSpec.java b/app/src/module_album/java/com/zhihu/matisse/internal/entity/SelectionSpec.java
index 7115f3a01..f120429c8 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/entity/SelectionSpec.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/entity/SelectionSpec.java
@@ -17,7 +17,7 @@
package com.zhihu.matisse.internal.entity;
import android.content.pm.ActivityInfo;
-import android.support.annotation.StyleRes;
+import androidx.annotation.StyleRes;
import com.zhihu.matisse.MimeType;
import com.yizhuan.erban.R;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumLoader.java b/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumLoader.java
index f328296a9..482e22a76 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumLoader.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumLoader.java
@@ -22,7 +22,7 @@ import android.database.MatrixCursor;
import android.database.MergeCursor;
import android.net.Uri;
import android.provider.MediaStore;
-import android.support.v4.content.CursorLoader;
+import androidx.loader.content.CursorLoader;
import com.zhihu.matisse.internal.entity.Album;
import com.zhihu.matisse.internal.entity.SelectionSpec;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java b/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java
index ea2b2919e..47c22b0d2 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/loader/AlbumMediaLoader.java
@@ -22,7 +22,7 @@ import android.database.MatrixCursor;
import android.database.MergeCursor;
import android.net.Uri;
import android.provider.MediaStore;
-import android.support.v4.content.CursorLoader;
+import androidx.loader.content.CursorLoader;
import com.zhihu.matisse.internal.entity.Album;
import com.zhihu.matisse.internal.entity.Item;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumCollection.java b/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumCollection.java
index bdfa925e1..ceabef63a 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumCollection.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumCollection.java
@@ -19,9 +19,9 @@ package com.zhihu.matisse.internal.model;
import android.content.Context;
import android.database.Cursor;
import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
+import androidx.fragment.app.FragmentActivity;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
import com.zhihu.matisse.internal.loader.AlbumLoader;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java b/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java
index 90a938ab7..fa25939ec 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/model/AlbumMediaCollection.java
@@ -19,11 +19,11 @@ package com.zhihu.matisse.internal.model;
import android.content.Context;
import android.database.Cursor;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
import com.zhihu.matisse.internal.entity.Album;
import com.zhihu.matisse.internal.loader.AlbumMediaLoader;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java
index 881ca4a2d..a3d879680 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/AlbumPreviewActivity.java
@@ -17,7 +17,7 @@ package com.zhihu.matisse.internal.ui;
import android.database.Cursor;
import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.zhihu.matisse.internal.entity.Album;
import com.zhihu.matisse.internal.entity.Item;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java
index 253be76a3..1775fcba5 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/BasePreviewActivity.java
@@ -19,10 +19,10 @@ import android.app.Activity;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
+import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java
index 9a685640d..3498935aa 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/MediaSelectionFragment.java
@@ -18,10 +18,10 @@ package com.zhihu.matisse.internal.ui;
import android.content.Context;
import android.database.Cursor;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java
index 95aed53bc..a5ae56ffe 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/PreviewItemFragment.java
@@ -20,8 +20,8 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.Point;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java
index 4bd6e25a7..8b934c7fd 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/SelectedPreviewActivity.java
@@ -16,7 +16,7 @@
package com.zhihu.matisse.internal.ui;
import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.zhihu.matisse.internal.entity.Item;
import com.zhihu.matisse.internal.entity.SelectionSpec;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java
index 83de6ffba..7eb8be7f7 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/AlbumMediaAdapter.java
@@ -19,8 +19,8 @@ import android.content.Context;
import android.content.res.TypedArray;
import android.database.Cursor;
import android.graphics.drawable.Drawable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java
index eef46f055..b75abc1cb 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/PreviewPagerAdapter.java
@@ -15,9 +15,9 @@
*/
package com.zhihu.matisse.internal.ui.adapter;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
import android.view.ViewGroup;
import com.zhihu.matisse.internal.entity.Item;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java
index 6557dde4d..48203b092 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/adapter/RecyclerViewCursorAdapter.java
@@ -17,7 +17,7 @@ package com.zhihu.matisse.internal.ui.adapter;
import android.database.Cursor;
import android.provider.MediaStore;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
public abstract class RecyclerViewCursorAdapter extends
RecyclerView.Adapter {
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java
index b00ef7d9e..7b8210268 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/AlbumsSpinner.java
@@ -20,8 +20,8 @@ import android.content.res.TypedArray;
import android.database.Cursor;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.ListPopupWindow;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.ListPopupWindow;
import android.view.View;
import android.widget.AdapterView;
import android.widget.CursorAdapter;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java
index dd388a882..f17adf9bb 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckRadioView.java
@@ -3,8 +3,8 @@ package com.zhihu.matisse.internal.ui.widget;
import android.content.Context;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
-import android.support.v4.content.res.ResourcesCompat;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.appcompat.widget.AppCompatImageView;
import android.util.AttributeSet;
import com.yizhuan.erban.R;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckView.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckView.java
index 1ea8df3b9..a6f781124 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckView.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/CheckView.java
@@ -27,7 +27,7 @@ import android.graphics.Rect;
import android.graphics.Shader;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
-import android.support.v4.content.res.ResourcesCompat;
+import androidx.core.content.res.ResourcesCompat;
import android.text.TextPaint;
import android.util.AttributeSet;
import android.view.View;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java
index 85449203f..11044aab0 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/IncapableDialog.java
@@ -18,9 +18,9 @@ package com.zhihu.matisse.internal.ui.widget;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+import androidx.appcompat.app.AlertDialog;
import android.text.TextUtils;
import com.yizhuan.erban.R;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java
index 6269d401d..21afb86ad 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGrid.java
@@ -17,7 +17,7 @@ package com.zhihu.matisse.internal.ui.widget;
import android.content.Context;
import android.graphics.drawable.Drawable;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.format.DateUtils;
import android.util.AttributeSet;
import android.view.LayoutInflater;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java
index eebcd429b..dca609c8e 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/MediaGridInset.java
@@ -16,7 +16,7 @@
package com.zhihu.matisse.internal.ui.widget;
import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
public class MediaGridInset extends RecyclerView.ItemDecoration {
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java
index 56fd37042..b3e66c31c 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/PreviewViewPager.java
@@ -16,7 +16,7 @@
package com.zhihu.matisse.internal.ui.widget;
import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.View;
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java
index 285515702..b1a522028 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/ui/widget/RoundedRectangleImageView.java
@@ -19,7 +19,7 @@ import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Path;
import android.graphics.RectF;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
import android.util.AttributeSet;
public class RoundedRectangleImageView extends AppCompatImageView {
diff --git a/app/src/module_album/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java b/app/src/module_album/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java
index 4a2b33426..0ab84afce 100644
--- a/app/src/module_album/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java
+++ b/app/src/module_album/java/com/zhihu/matisse/internal/utils/MediaStoreCompat.java
@@ -24,9 +24,9 @@ import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import android.provider.MediaStore;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.FileProvider;
-import android.support.v4.os.EnvironmentCompat;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.FileProvider;
+import androidx.core.os.EnvironmentCompat;
import com.zhihu.matisse.internal.entity.CaptureStrategy;
diff --git a/app/src/module_album/java/com/zhihu/matisse/listener/OnSelectedListener.java b/app/src/module_album/java/com/zhihu/matisse/listener/OnSelectedListener.java
index 33e374e62..b7d6d2204 100644
--- a/app/src/module_album/java/com/zhihu/matisse/listener/OnSelectedListener.java
+++ b/app/src/module_album/java/com/zhihu/matisse/listener/OnSelectedListener.java
@@ -17,7 +17,7 @@
package com.zhihu.matisse.listener;
import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import java.util.List;
diff --git a/app/src/module_album/java/com/zhihu/matisse/ui/MatisseActivity.java b/app/src/module_album/java/com/zhihu/matisse/ui/MatisseActivity.java
index 6c9767ab6..839bb813c 100644
--- a/app/src/module_album/java/com/zhihu/matisse/ui/MatisseActivity.java
+++ b/app/src/module_album/java/com/zhihu/matisse/ui/MatisseActivity.java
@@ -28,14 +28,14 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
import android.widget.AdapterView;
diff --git a/app/src/module_album/java/com/zhihu/matisse/widget/ConfirmPickView.java b/app/src/module_album/java/com/zhihu/matisse/widget/ConfirmPickView.java
index 13899044e..775160ca3 100644
--- a/app/src/module_album/java/com/zhihu/matisse/widget/ConfirmPickView.java
+++ b/app/src/module_album/java/com/zhihu/matisse/widget/ConfirmPickView.java
@@ -2,7 +2,7 @@ package com.zhihu.matisse.widget;
import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.widget.LinearLayout;
import android.widget.TextView;
diff --git a/app/src/module_album/res/layout/activity_matisse.xml b/app/src/module_album/res/layout/activity_matisse.xml
index e646761e1..0672e8b0b 100644
--- a/app/src/module_album/res/layout/activity_matisse.xml
+++ b/app/src/module_album/res/layout/activity_matisse.xml
@@ -21,7 +21,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
-
+
-
-
+
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_bank_card/res/layout/activity_bank_card_bind.xml b/app/src/module_bank_card/res/layout/activity_bank_card_bind.xml
index 0f8baf3ee..b87965da8 100644
--- a/app/src/module_bank_card/res/layout/activity_bank_card_bind.xml
+++ b/app/src/module_bank_card/res/layout/activity_bank_card_bind.xml
@@ -1,5 +1,5 @@
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_bank_card/res/layout/activity_bank_card_list.xml b/app/src/module_bank_card/res/layout/activity_bank_card_list.xml
index a0ccc4bcc..3a211eadc 100644
--- a/app/src/module_bank_card/res/layout/activity_bank_card_list.xml
+++ b/app/src/module_bank_card/res/layout/activity_bank_card_list.xml
@@ -1,5 +1,5 @@
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_bank_card/res/layout/frg_my_nameplate_common.xml b/app/src/module_bank_card/res/layout/frg_my_nameplate_common.xml
index 7c13d0d36..5a7c83854 100644
--- a/app/src/module_bank_card/res/layout/frg_my_nameplate_common.xml
+++ b/app/src/module_bank_card/res/layout/frg_my_nameplate_common.xml
@@ -5,19 +5,19 @@
android:id="@+id/status_layout"
>
-
-
-
+
-
+
\ No newline at end of file
diff --git a/app/src/module_bank_card/res/layout/item_bank_card.xml b/app/src/module_bank_card/res/layout/item_bank_card.xml
index ab66caa42..886e1513c 100644
--- a/app/src/module_bank_card/res/layout/item_bank_card.xml
+++ b/app/src/module_bank_card/res/layout/item_bank_card.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_bank_card/res/layout/item_room_collection.xml b/app/src/module_bank_card/res/layout/item_room_collection.xml
index d79abe308..14a9a1bea 100644
--- a/app/src/module_bank_card/res/layout/item_room_collection.xml
+++ b/app/src/module_bank_card/res/layout/item_room_collection.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentAdapter.java
index 3fcb4bd3f..15af048df 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentAdapter.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/CommentAdapter.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.community.dynamic.adapter;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java
index f94fd1ec0..3f6fb24b6 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/adapter/WorldDynamicAdapter.java
@@ -3,9 +3,9 @@ package com.yizhuan.erban.community.dynamic.adapter;
import android.app.Activity;
import android.content.Context;
-import android.graphics.drawable.AnimationDrawable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java
index ff02aa6b6..869c2905e 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java
@@ -4,18 +4,16 @@ import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
-import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
-import android.support.constraint.ConstraintLayout;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
-import android.text.style.ForegroundColorSpan;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
@@ -49,7 +47,6 @@ import com.yizhuan.erban.community.photo.PagerOption;
import com.yizhuan.erban.community.utils.ObjectTypeHelper;
import com.yizhuan.erban.community.widget.DynamicNickDetailWidget;
import com.yizhuan.erban.community.widget.ExpandableTextView;
-import com.yizhuan.erban.miniworld.activity.MiniWorldGuestPageActivity;
import com.yizhuan.erban.miniworld.activity.TopicMainActivity;
import com.yizhuan.erban.ui.login.BinderPhoneActivity;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
@@ -1225,17 +1222,4 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
}
return true;
}
-
- @Override
- protected boolean needSteepStateBar() {
- return true;
- }
-
- @Override
- protected void setStatusBar() {
- super.setStatusBar();
- StatusBarUtil.transparencyBar(this);
- StatusBarUtil.StatusBarLightMode(this);
- }
-
}
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java
index 7acd89924..d13fc3550 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/WorldDynamicFragment.java
@@ -1,10 +1,10 @@
package com.yizhuan.erban.community.dynamic.view;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -12,7 +12,6 @@ import android.view.ViewGroup;
import com.trello.rxlifecycle2.android.FragmentEvent;
import com.yizhuan.erban.R;
import com.yizhuan.erban.UIHelper;
-import com.yizhuan.erban.base.BaseFragment;
import com.yizhuan.erban.base.BaseMvpFragment;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.community.dynamic.adapter.WorldDynamicAdapter;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPagerAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPagerAdapter.java
index 2200d9e55..d21c8e9dd 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPagerAdapter.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPagerAdapter.java
@@ -15,9 +15,9 @@
*/
package com.yizhuan.erban.community.photo;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
import android.view.ViewGroup;
import com.zhihu.matisse.internal.entity.CustomItem;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPhotoItemFragment.java b/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPhotoItemFragment.java
index bc4beb287..2b4b12774 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPhotoItemFragment.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/photo/BigPhotoItemFragment.java
@@ -18,14 +18,12 @@ package com.yizhuan.erban.community.photo;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.TextView;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/DynamicImageAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/photo/DynamicImageAdapter.java
index 56d16e40b..5104f75db 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/photo/DynamicImageAdapter.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/photo/DynamicImageAdapter.java
@@ -1,9 +1,8 @@
package com.yizhuan.erban.community.photo;
import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
import android.view.ViewGroup;
import android.widget.ImageView;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/PhotoAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/photo/PhotoAdapter.java
index cb12c8279..aa6d99a62 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/photo/PhotoAdapter.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/photo/PhotoAdapter.java
@@ -5,8 +5,8 @@ import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.view.View;
import com.bumptech.glide.request.target.SimpleTarget;
@@ -14,12 +14,10 @@ import com.bumptech.glide.request.transition.Transition;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
-import com.netease.nim.uikit.common.util.log.LogUtil;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.community.widget.ZoomImageView;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
import com.yizhuan.erban.ui.widget.ButtonItem;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/photo/PreviewPhotoActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/photo/PreviewPhotoActivity.java
index 27849fedd..cfcf5d6ae 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/photo/PreviewPhotoActivity.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/photo/PreviewPhotoActivity.java
@@ -4,10 +4,10 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.os.Parcelable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.PagerSnapHelper;
-import android.support.v7.widget.RecyclerView;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.PagerSnapHelper;
+import androidx.recyclerview.widget.RecyclerView;
import com.netease.nim.uikit.common.util.log.LogUtil;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/ImageAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/publish/ImageAdapter.java
index 03c77c92c..b8a4711b5 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/publish/ImageAdapter.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/publish/ImageAdapter.java
@@ -1,23 +1,17 @@
package com.yizhuan.erban.community.publish;
import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
import android.view.ViewGroup;
import android.widget.ImageView;
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
-import com.bumptech.glide.request.RequestOptions;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
-import com.netease.nim.uikit.common.util.log.LogUtil;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
-import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.xchat_android_core.community.bean.PublishItem;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java
index 773f4f55c..b780e0426 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/PublishActivity.java
@@ -3,8 +3,8 @@ package com.yizhuan.erban.community.publish.view;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java
index cb63b1770..f979cc620 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java
@@ -1,9 +1,9 @@
package com.yizhuan.erban.community.publish.view;
import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java
index 0eaa8990d..a13fc5548 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java
@@ -2,12 +2,11 @@ package com.yizhuan.erban.community.square;
import android.graphics.Rect;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
-import android.util.Log;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -18,13 +17,11 @@ import com.trello.rxlifecycle2.android.FragmentEvent;
import com.yizhuan.erban.R;
import com.yizhuan.erban.UIHelper;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
-import com.yizhuan.erban.base.BaseFragment;
import com.yizhuan.erban.base.BaseMvpActivity;
import com.yizhuan.erban.base.BaseMvpFragment;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.community.helper.ShareDynamicHelper;
import com.yizhuan.erban.community.square.adapter.SquareDynamicAdapter;
-import com.yizhuan.erban.home.activity.CollectionRoomActivity;
import com.yizhuan.erban.miniworld.activity.AllTopicActivity;
import com.yizhuan.erban.miniworld.activity.TopicMainActivity;
import com.yizhuan.erban.miniworld.adapter.RecommendTopicListAdapter;
@@ -33,7 +30,6 @@ import com.yizhuan.erban.miniworld.presenter.MiniWorldCategoryPresenter;
import com.yizhuan.erban.miniworld.view.IMiniWorldCategoryView;
import com.yizhuan.erban.ui.widget.ButtonItem;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.erban.ui.widget.recyclerview.decoration.HorizontalDecoration;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.community.CommunityConstant;
@@ -41,7 +37,6 @@ import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean;
import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult;
import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel;
import com.yizhuan.xchat_android_core.community.event.DynamicPublishEvent;
-import com.yizhuan.xchat_android_core.community.event.UnReadCountEvent;
import com.yizhuan.xchat_android_core.community.square.SquareModel;
import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java
index f7bbb60c5..f45a8ad64 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java
@@ -2,9 +2,9 @@ package com.yizhuan.erban.community.square;
import android.annotation.SuppressLint;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -20,7 +20,6 @@ import com.yizhuan.erban.community.publish.view.PublishActivity;
import com.yizhuan.erban.home.adapter.TopMagicIndicatorAdapter;
import com.yizhuan.erban.home.fragment.CommunityNoticeAct;
import com.yizhuan.erban.home.fragment.FindTabFragment;
-import com.yizhuan.erban.miniworld.activity.AllTopicActivity;
import com.yizhuan.erban.ui.widget.OnPageSelectedListener;
import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator;
import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java
index 005f98ae0..3eef74af3 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java
@@ -3,8 +3,8 @@ package com.yizhuan.erban.community.user_dynamic;
import android.app.Activity;
import android.content.Context;
import android.graphics.drawable.AnimationDrawable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java
index b125efa2f..54dea98e7 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java
@@ -1,10 +1,9 @@
package com.yizhuan.erban.community.user_dynamic;
-import android.app.Activity;
import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java b/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java
index e49890b96..6244b2110 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.community.widget;
import android.content.Context;
-import android.support.constraint.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintLayout;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageView;
@@ -11,9 +11,7 @@ import android.widget.TextView;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
-import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.utils.RegexUtil;
-import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.user.bean.BaseUserInfo;
import com.yizhuan.xchat_android_library.widget.ShapeConstrainLayout;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java b/app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java
index c806e099a..673f1d278 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/widget/ExpandableTextView.java
@@ -23,13 +23,12 @@ import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.text.Editable;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import android.text.TextUtils;
-import android.text.TextWatcher;
import android.util.AttributeSet;
import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
@@ -44,7 +43,6 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.netease.nim.uikit.business.session.emoji.MoonUtil;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java b/app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java
index aef8280e9..3c70a53c4 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java
@@ -2,10 +2,10 @@ package com.yizhuan.erban.community.widget;
import android.app.Activity;
import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/TouchHideKeyboardView.java b/app/src/module_community/java/com/yizhuan/erban/community/widget/TouchHideKeyboardView.java
index eedd1d584..a4b3c90a5 100644
--- a/app/src/module_community/java/com/yizhuan/erban/community/widget/TouchHideKeyboardView.java
+++ b/app/src/module_community/java/com/yizhuan/erban/community/widget/TouchHideKeyboardView.java
@@ -2,7 +2,7 @@ package com.yizhuan.erban.community.widget;
import android.app.Activity;
import android.content.Context;
-import android.support.constraint.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintLayout;
import android.util.AttributeSet;
import android.view.MotionEvent;
diff --git a/app/src/module_community/res/drawable/selector_dy_send_btn.xml b/app/src/module_community/res/drawable/selector_dy_send_btn.xml
index 413c972e3..785552635 100644
--- a/app/src/module_community/res/drawable/selector_dy_send_btn.xml
+++ b/app/src/module_community/res/drawable/selector_dy_send_btn.xml
@@ -9,7 +9,7 @@
-
-
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/activity_big_photo.xml b/app/src/module_community/res/layout/activity_big_photo.xml
index c0acb88c1..80cf500b9 100644
--- a/app/src/module_community/res/layout/activity_big_photo.xml
+++ b/app/src/module_community/res/layout/activity_big_photo.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/activity_dynamic_detail.xml b/app/src/module_community/res/layout/activity_dynamic_detail.xml
index c10274cad..2605733fe 100644
--- a/app/src/module_community/res/layout/activity_dynamic_detail.xml
+++ b/app/src/module_community/res/layout/activity_dynamic_detail.xml
@@ -1,5 +1,5 @@
-
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/activity_preview_photo.xml b/app/src/module_community/res/layout/activity_preview_photo.xml
index db375cf30..e77eca25f 100644
--- a/app/src/module_community/res/layout/activity_preview_photo.xml
+++ b/app/src/module_community/res/layout/activity_preview_photo.xml
@@ -1,5 +1,5 @@
-
-
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/dialog_dy_publish_success.xml b/app/src/module_community/res/layout/dialog_dy_publish_success.xml
index c0f765293..25131919f 100644
--- a/app/src/module_community/res/layout/dialog_dy_publish_success.xml
+++ b/app/src/module_community/res/layout/dialog_dy_publish_success.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/fragment_home_dynamic.xml b/app/src/module_community/res/layout/fragment_home_dynamic.xml
index 7e9c2bcfe..8c5cefa2c 100644
--- a/app/src/module_community/res/layout/fragment_home_dynamic.xml
+++ b/app/src/module_community/res/layout/fragment_home_dynamic.xml
@@ -1,5 +1,5 @@
-
@@ -16,7 +16,7 @@
android:layout_height="match_parent"
android:id="@+id/status_layout">
- -->
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/fragment_square.xml b/app/src/module_community/res/layout/fragment_square.xml
index 7fc212e1b..d928801f5 100644
--- a/app/src/module_community/res/layout/fragment_square.xml
+++ b/app/src/module_community/res/layout/fragment_square.xml
@@ -16,7 +16,7 @@
android:src="@mipmap/bg_home_top"
app:layout_constraintTop_toTopOf="parent" />
-
@@ -72,7 +72,7 @@
-
-
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/fragment_square_dynamic.xml b/app/src/module_community/res/layout/fragment_square_dynamic.xml
index f9273ee8c..6678d36e0 100644
--- a/app/src/module_community/res/layout/fragment_square_dynamic.xml
+++ b/app/src/module_community/res/layout/fragment_square_dynamic.xml
@@ -1,10 +1,10 @@
-
-
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/fragment_world_dynamic.xml b/app/src/module_community/res/layout/fragment_world_dynamic.xml
index 8d69629bd..5f5b03922 100644
--- a/app/src/module_community/res/layout/fragment_world_dynamic.xml
+++ b/app/src/module_community/res/layout/fragment_world_dynamic.xml
@@ -1,5 +1,5 @@
-
@@ -7,16 +7,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/frg_user_dynamic.xml b/app/src/module_community/res/layout/frg_user_dynamic.xml
index b0a1970e6..62c4e38ee 100644
--- a/app/src/module_community/res/layout/frg_user_dynamic.xml
+++ b/app/src/module_community/res/layout/frg_user_dynamic.xml
@@ -1,15 +1,15 @@
-
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/frg_worlds_choose.xml b/app/src/module_community/res/layout/frg_worlds_choose.xml
index 901b503fc..86c2d22d2 100644
--- a/app/src/module_community/res/layout/frg_worlds_choose.xml
+++ b/app/src/module_community/res/layout/frg_worlds_choose.xml
@@ -4,18 +4,18 @@
xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
-
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/head_dynamic_detail.xml b/app/src/module_community/res/layout/head_dynamic_detail.xml
index 58a620d89..eff3a40af 100644
--- a/app/src/module_community/res/layout/head_dynamic_detail.xml
+++ b/app/src/module_community/res/layout/head_dynamic_detail.xml
@@ -1,12 +1,12 @@
-
-
+
-
-
-
+
-
-
+
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/item_community_notice_list.xml b/app/src/module_community/res/layout/item_community_notice_list.xml
index f6ebd2242..c7c4595a0 100644
--- a/app/src/module_community/res/layout/item_community_notice_list.xml
+++ b/app/src/module_community/res/layout/item_community_notice_list.xml
@@ -1,5 +1,5 @@
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/item_dy_comment.xml b/app/src/module_community/res/layout/item_dy_comment.xml
index 7197e7055..163bb1656 100644
--- a/app/src/module_community/res/layout/item_dy_comment.xml
+++ b/app/src/module_community/res/layout/item_dy_comment.xml
@@ -1,5 +1,5 @@
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/item_dy_reply.xml b/app/src/module_community/res/layout/item_dy_reply.xml
index b551e9b1c..ff407cc71 100644
--- a/app/src/module_community/res/layout/item_dy_reply.xml
+++ b/app/src/module_community/res/layout/item_dy_reply.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/item_dynamic_image.xml b/app/src/module_community/res/layout/item_dynamic_image.xml
index 98a0400c4..3cb568348 100644
--- a/app/src/module_community/res/layout/item_dynamic_image.xml
+++ b/app/src/module_community/res/layout/item_dynamic_image.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/item_dynamic_sys.xml b/app/src/module_community/res/layout/item_dynamic_sys.xml
index 42af9c222..eab8fb80c 100644
--- a/app/src/module_community/res/layout/item_dynamic_sys.xml
+++ b/app/src/module_community/res/layout/item_dynamic_sys.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/item_grid_image_widget.xml b/app/src/module_community/res/layout/item_grid_image_widget.xml
index c198f48a4..6ce0b6358 100644
--- a/app/src/module_community/res/layout/item_grid_image_widget.xml
+++ b/app/src/module_community/res/layout/item_grid_image_widget.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/item_publish_image.xml b/app/src/module_community/res/layout/item_publish_image.xml
index ba47746a1..5c8e26967 100644
--- a/app/src/module_community/res/layout/item_publish_image.xml
+++ b/app/src/module_community/res/layout/item_publish_image.xml
@@ -1,5 +1,5 @@
-
@@ -29,4 +29,4 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/item_square_dynamic.xml b/app/src/module_community/res/layout/item_square_dynamic.xml
index 4f80d9819..f05527723 100644
--- a/app/src/module_community/res/layout/item_square_dynamic.xml
+++ b/app/src/module_community/res/layout/item_square_dynamic.xml
@@ -1,5 +1,5 @@
-
-
-
+
-
+
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/item_user_dynamic_image.xml b/app/src/module_community/res/layout/item_user_dynamic_image.xml
index d72b00e78..ad4a0efab 100644
--- a/app/src/module_community/res/layout/item_user_dynamic_image.xml
+++ b/app/src/module_community/res/layout/item_user_dynamic_image.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/module_community/res/layout/item_user_dynamic_list.xml b/app/src/module_community/res/layout/item_user_dynamic_list.xml
index bdd03a1ab..31a7825c4 100644
--- a/app/src/module_community/res/layout/item_user_dynamic_list.xml
+++ b/app/src/module_community/res/layout/item_user_dynamic_list.xml
@@ -8,7 +8,7 @@
xmlns:tools="http://schemas.android.com/tools">
-
-
+
-
-
-
+
diff --git a/app/src/module_community/res/layout/item_world_dynamic.xml b/app/src/module_community/res/layout/item_world_dynamic.xml
index e5cb5596e..243607257 100644
--- a/app/src/module_community/res/layout/item_world_dynamic.xml
+++ b/app/src/module_community/res/layout/item_world_dynamic.xml
@@ -1,5 +1,5 @@
-
-
-
+
-
-
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/item_worlds_choose.xml b/app/src/module_community/res/layout/item_worlds_choose.xml
index 3b6a95175..1d09bb77c 100644
--- a/app/src/module_community/res/layout/item_worlds_choose.xml
+++ b/app/src/module_community/res/layout/item_worlds_choose.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/layout_dy_nick_detail.xml b/app/src/module_community/res/layout/layout_dy_nick_detail.xml
index 4d030e569..7682a57e0 100644
--- a/app/src/module_community/res/layout/layout_dy_nick_detail.xml
+++ b/app/src/module_community/res/layout/layout_dy_nick_detail.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/view_holder_world_dynamic_share.xml b/app/src/module_community/res/layout/view_holder_world_dynamic_share.xml
index 4959ef23b..62f9f9f81 100644
--- a/app/src/module_community/res/layout/view_holder_world_dynamic_share.xml
+++ b/app/src/module_community/res/layout/view_holder_world_dynamic_share.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_community/res/layout/widget_grid_image.xml b/app/src/module_community/res/layout/widget_grid_image.xml
index 290cc6138..eb49035d7 100644
--- a/app/src/module_community/res/layout/widget_grid_image.xml
+++ b/app/src/module_community/res/layout/widget_grid_image.xml
@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/HallDataManager.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/HallDataManager.java
index 0fdbf065b..4c0e6bb1a 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/HallDataManager.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/HallDataManager.java
@@ -1,8 +1,8 @@
package com.yizhuan.erban.module_hall;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.Observer;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Observer;
import android.text.TextUtils;
import com.netease.nim.uikit.api.NimUIKit;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminAddActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminAddActivity.java
index bca233497..a42bd1afc 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminAddActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminAddActivity.java
@@ -3,10 +3,10 @@ package com.yizhuan.erban.module_hall.hall.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.content.ContextCompat;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminListActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminListActivity.java
index 10e5654d9..0ce2ec810 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminListActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminListActivity.java
@@ -3,9 +3,9 @@ package com.yizhuan.erban.module_hall.hall.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AuthSettingActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AuthSettingActivity.java
index 726d7476a..d6e7d712b 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AuthSettingActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AuthSettingActivity.java
@@ -3,7 +3,7 @@ package com.yizhuan.erban.module_hall.hall.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.text.SpannableString;
import android.text.TextUtils;
import android.view.View;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/GroupMemberListActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/GroupMemberListActivity.java
index 7b4360a83..4b1c1c64b 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/GroupMemberListActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/GroupMemberListActivity.java
@@ -3,16 +3,14 @@ package com.yizhuan.erban.module_hall.hall.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.SpannableString;
import android.view.View;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.coorchice.library.utils.LogUtils;
-import com.netease.nim.uikit.common.util.log.LogUtil;
import com.orhanobut.logger.Logger;
import com.yizhuan.erban.R;
import com.yizhuan.erban.UIHelper;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallNameSettingActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallNameSettingActivity.java
index 7e3af0440..0e59a79c0 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallNameSettingActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallNameSettingActivity.java
@@ -3,11 +3,10 @@ package com.yizhuan.erban.module_hall.hall.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
-import android.text.InputFilter;
+import androidx.core.content.ContextCompat;
+
import android.text.TextUtils;
import android.view.View;
-import android.widget.EditText;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpActivity;
@@ -16,7 +15,6 @@ import com.yizhuan.erban.common.widget.LimitEditText;
import com.yizhuan.erban.module_hall.HallDataManager;
import com.yizhuan.erban.module_hall.hall.presenter.HallNamePresenter;
import com.yizhuan.erban.module_hall.hall.view.IHallNameView;
-import com.yizhuan.erban.utils.LimitInputFliter;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
import butterknife.BindView;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java
index 01eb2093f..a59a1ac6c 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/IncomeStatisticsActivity.java
@@ -3,9 +3,9 @@ package com.yizhuan.erban.module_hall.hall.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
import android.view.View;
import android.widget.TextView;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/MemberSearchActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/MemberSearchActivity.java
index 20ad725f2..1553272fb 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/MemberSearchActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/MemberSearchActivity.java
@@ -3,8 +3,8 @@ package com.yizhuan.erban.module_hall.hall.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.View;
import android.widget.EditText;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java
index 7457ad234..b52ce8b9c 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java
@@ -4,10 +4,10 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/MemberViewHolder.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/MemberViewHolder.java
index b701e7830..8f69d5c28 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/MemberViewHolder.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/MemberViewHolder.java
@@ -1,6 +1,6 @@
package com.yizhuan.erban.module_hall.hall.adapter;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
import android.view.View;
import android.widget.ImageView;
import android.widget.RelativeLayout;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/OptionAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/OptionAdapter.java
index 994b79c16..7bcf33e1f 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/OptionAdapter.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/OptionAdapter.java
@@ -1,14 +1,13 @@
package com.yizhuan.erban.module_hall.hall.adapter;
import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
-import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo;
import java.util.List;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/GroupMemberPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/GroupMemberPresenter.java
index 008f9ac5c..1aff71deb 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/GroupMemberPresenter.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/GroupMemberPresenter.java
@@ -1,12 +1,11 @@
package com.yizhuan.erban.module_hall.hall.presenter;
import android.content.Context;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
-import com.netease.nim.uikit.common.util.log.LogUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.widget.MessageView;
import com.yizhuan.erban.base.BaseMvpPresenter;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/HallMenuDialog.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/HallMenuDialog.java
index 9645e3e3a..6cce19b1a 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/HallMenuDialog.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/HallMenuDialog.java
@@ -2,7 +2,7 @@ package com.yizhuan.erban.module_hall.hall.view.dialog;
import android.app.Dialog;
import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerDialog.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerDialog.java
index 096b0044c..c4408de98 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerDialog.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerDialog.java
@@ -4,9 +4,9 @@ import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java
index 430613c25..aab14572a 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/indicator/StatisticsIndicatorAdapter.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.module_hall.hall.view.indicator;
import android.content.Context;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.view.ViewGroup;
import android.widget.FrameLayout;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
index 7ac56474e..6908b7a73 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.module_hall.im.msgholder;
import android.graphics.Color;
-import android.support.constraint.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintLayout;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextPaint;
@@ -20,7 +20,6 @@ import com.netease.nim.uikit.common.util.sys.ScreenUtil;
import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.orhanobut.logger.Logger;
import com.yizhuan.erban.R;
-import com.yizhuan.erban.avroom.widget.MessageView;
import com.yizhuan.erban.module_hall.im.NimHelper;
import com.yizhuan.erban.ui.im.RouterHandler;
import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
@@ -32,8 +31,6 @@ import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.ApplyResult;
import com.yizhuan.xchat_android_core.module_hall.im.bean.HallMsgComponent;
import com.yizhuan.xchat_android_core.module_hall.im.bean.HallMsgLayout;
-import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgComponent;
-import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgLayout;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java
index 92cd20877..c3d58c95d 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java
@@ -1,9 +1,9 @@
package com.yizhuan.erban.module_hall.income;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java
index d7183eda7..510fbba15 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java
@@ -3,8 +3,8 @@ package com.yizhuan.erban.module_hall.income;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.widget.ImageView;
import android.widget.TextView;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeAdapter.java
index dd08e69d8..aacd773a6 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeAdapter.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeAdapter.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.module_hall.income.adapter;
import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java
index 9f2ccc5e0..23b22174f 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.module_hall.income.adapter;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
import android.text.SpannableString;
import android.text.style.ForegroundColorSpan;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/SecretCodeDialog.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/SecretCodeDialog.java
index 7e966f041..f131bcdc0 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/SecretCodeDialog.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/SecretCodeDialog.java
@@ -2,36 +2,20 @@ package com.yizhuan.erban.module_hall.secretcode;
import android.content.Context;
import android.graphics.Color;
-import android.os.Bundle;
-import android.support.design.widget.BottomSheetBehavior;
-import android.support.design.widget.BottomSheetDialog;
-import android.text.ClipboardManager;
import android.view.View;
-import android.view.WindowManager;
-import android.widget.FrameLayout;
import android.widget.TextView;
import com.coorchice.library.SuperTextView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.UIHelper;
import com.yizhuan.erban.base.BaseBsDialog;
-import com.yizhuan.erban.module_hall.HallDataManager;
-import com.yizhuan.erban.ui.widget.marqueeview.Utils;
import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.SecretCodeInfo;
-import com.yizhuan.xchat_android_core.share.ShareModel;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
-import com.yizhuan.xchat_android_core.user.UserModel;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.TextUtils;
import butterknife.BindView;
-import butterknife.ButterKnife;
import butterknife.OnClick;
-import cn.sharesdk.framework.Platform;
-import cn.sharesdk.framework.ShareSDK;
-import cn.sharesdk.tencent.qq.QQ;
-import cn.sharesdk.wechat.friends.Wechat;
/**
* @author xiaoyu
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/ShareSecretCodeDialog.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/ShareSecretCodeDialog.java
index 3eedc0d76..a521c4493 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/ShareSecretCodeDialog.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/ShareSecretCodeDialog.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.module_hall.secretcode;
import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.view.View;
import android.widget.TextView;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/HTeamDataManager.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/HTeamDataManager.java
index dd3a7e9a5..2b4a67d9f 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/HTeamDataManager.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/HTeamDataManager.java
@@ -1,11 +1,10 @@
package com.yizhuan.erban.module_hall.team;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.Observer;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Observer;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo;
-import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel;
/**
* 厅群信息的管理，只针对单个群信息
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/CreateHallTeamActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/CreateHallTeamActivity.java
index 483b8c396..1bfefd737 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/CreateHallTeamActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/CreateHallTeamActivity.java
@@ -3,8 +3,8 @@ package com.yizhuan.erban.module_hall.team.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -30,7 +30,6 @@ import com.yizhuan.xchat_android_core.module_hall.team.bean.HTeamChatLimit;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.utils.ListUtils;
import com.yizhuan.xchat_android_library.widget.decoration.RowColumnDifItemDecoration;
import java.util.ArrayList;
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HTeamMemberListActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HTeamMemberListActivity.java
index 61bacc5e4..7b1d94131 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HTeamMemberListActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HTeamMemberListActivity.java
@@ -4,8 +4,8 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.style.ForegroundColorSpan;
import android.view.View;
import android.widget.TextView;
@@ -30,7 +30,6 @@ import com.yizhuan.erban.team.bean.NimTeamMember;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamMember;
import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel;
-import com.yizhuan.xchat_android_core.module_hall.team.event.HteamInfoUpdateInfoEvent;
import com.yizhuan.xchat_android_core.module_hall.team.event.HteamMemberNumChangeEvent;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
@@ -44,7 +43,6 @@ import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife;
import io.reactivex.Single;
-import io.reactivex.functions.Consumer;
/**
* 厅群成员列表
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/SelectTeamMemberActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/SelectTeamMemberActivity.java
index 9a1bccac3..957c55bb4 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/SelectTeamMemberActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/SelectTeamMemberActivity.java
@@ -3,8 +3,8 @@ package com.yizhuan.erban.module_hall.team.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.ArrayMap;
import android.view.View;
import android.widget.ImageView;
@@ -17,7 +17,6 @@ import com.yizhuan.erban.base.list.BaseViewHolder;
import com.yizhuan.erban.base.list.CommonAdapter;
import com.yizhuan.erban.base.list.IRecyclerListener;
import com.yizhuan.erban.base.list.LineColorDecoration;
-import com.yizhuan.erban.base.list.OnItemChildClickListener;
import com.yizhuan.erban.base.list.RefreshRecyclerView;
import com.yizhuan.erban.module_hall.HallConstant;
import com.yizhuan.erban.module_hall.HallDataManager;
@@ -35,10 +34,6 @@ import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
import io.reactivex.Single;
-import io.reactivex.SingleSource;
-import io.reactivex.functions.Action;
-import io.reactivex.functions.Consumer;
-import io.reactivex.functions.Function;
/**
* 选择群成员
diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamInfoShowActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamInfoShowActivity.java
index 9886e8cae..8b2f0e3c3 100644
--- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamInfoShowActivity.java
+++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamInfoShowActivity.java
@@ -3,7 +3,7 @@ package com.yizhuan.erban.module_hall.team.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
@@ -34,7 +34,6 @@ import com.yizhuan.xchat_android_core.module_hall.team.bean.HTeamType;
import com.yizhuan.xchat_android_core.module_hall.team.event.HteamInfoUpdateInfoEvent;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
-import com.yizhuan.xchat_android_library.widget.IOSSwitchView;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
diff --git a/app/src/module_labour_union/res/layout/activity_add_member.xml b/app/src/module_labour_union/res/layout/activity_add_member.xml
index 339ce9446..0cffd857a 100644
--- a/app/src/module_labour_union/res/layout/activity_add_member.xml
+++ b/app/src/module_labour_union/res/layout/activity_add_member.xml
@@ -64,12 +64,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
+
diff --git a/app/src/module_labour_union/res/layout/activity_admin_list.xml b/app/src/module_labour_union/res/layout/activity_admin_list.xml
index 921a81f30..7c43acea9 100644
--- a/app/src/module_labour_union/res/layout/activity_admin_list.xml
+++ b/app/src/module_labour_union/res/layout/activity_admin_list.xml
@@ -17,17 +17,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
diff --git a/app/src/module_labour_union/res/layout/activity_create_hall_team.xml b/app/src/module_labour_union/res/layout/activity_create_hall_team.xml
index f42ed9abd..5f445047b 100644
--- a/app/src/module_labour_union/res/layout/activity_create_hall_team.xml
+++ b/app/src/module_labour_union/res/layout/activity_create_hall_team.xml
@@ -1,5 +1,5 @@
-
-
-
+
diff --git a/app/src/module_labour_union/res/layout/activity_group_member.xml b/app/src/module_labour_union/res/layout/activity_group_member.xml
index 4f7106080..c488f9f71 100644
--- a/app/src/module_labour_union/res/layout/activity_group_member.xml
+++ b/app/src/module_labour_union/res/layout/activity_group_member.xml
@@ -30,17 +30,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
diff --git a/app/src/module_labour_union/res/layout/activity_hall_name.xml b/app/src/module_labour_union/res/layout/activity_hall_name.xml
index 18229a412..149797df1 100644
--- a/app/src/module_labour_union/res/layout/activity_hall_name.xml
+++ b/app/src/module_labour_union/res/layout/activity_hall_name.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_labour_union/res/layout/activity_hall_team_message.xml b/app/src/module_labour_union/res/layout/activity_hall_team_message.xml
index b842e270e..b192420da 100644
--- a/app/src/module_labour_union/res/layout/activity_hall_team_message.xml
+++ b/app/src/module_labour_union/res/layout/activity_hall_team_message.xml
@@ -24,7 +24,7 @@
android:layout_width="48dp"
android:layout_height="48dp" />
-
-
-
-
+
+
-
-
+
\ No newline at end of file
diff --git a/app/src/module_labour_union/res/layout/activity_module_hall.xml b/app/src/module_labour_union/res/layout/activity_module_hall.xml
index e4a62bb2c..f541f07a3 100644
--- a/app/src/module_labour_union/res/layout/activity_module_hall.xml
+++ b/app/src/module_labour_union/res/layout/activity_module_hall.xml
@@ -1,5 +1,5 @@
-
-
-
-
-
+
-
+
-
+
diff --git a/app/src/module_labour_union/res/layout/activity_team_edit.xml b/app/src/module_labour_union/res/layout/activity_team_edit.xml
index 488800095..915b56c03 100644
--- a/app/src/module_labour_union/res/layout/activity_team_edit.xml
+++ b/app/src/module_labour_union/res/layout/activity_team_edit.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_labour_union/res/layout/fragment_week_income.xml b/app/src/module_labour_union/res/layout/fragment_week_income.xml
index ae843ab71..77d9ef65f 100644
--- a/app/src/module_labour_union/res/layout/fragment_week_income.xml
+++ b/app/src/module_labour_union/res/layout/fragment_week_income.xml
@@ -1,6 +1,6 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_labour_union/res/layout/item_group_list.xml b/app/src/module_labour_union/res/layout/item_group_list.xml
index d642df05a..1597ec542 100644
--- a/app/src/module_labour_union/res/layout/item_group_list.xml
+++ b/app/src/module_labour_union/res/layout/item_group_list.xml
@@ -1,5 +1,5 @@
-
@@ -50,4 +50,4 @@
android:layout_height="1px"
android:background="@color/color_F8F8F8" />
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_labour_union/res/layout/item_hteam_member_common.xml b/app/src/module_labour_union/res/layout/item_hteam_member_common.xml
index a772d67bf..659bb0e2b 100644
--- a/app/src/module_labour_union/res/layout/item_hteam_member_common.xml
+++ b/app/src/module_labour_union/res/layout/item_hteam_member_common.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_labour_union/res/layout/item_member.xml b/app/src/module_labour_union/res/layout/item_member.xml
index 0be0077c4..a821cba84 100644
--- a/app/src/module_labour_union/res/layout/item_member.xml
+++ b/app/src/module_labour_union/res/layout/item_member.xml
@@ -55,7 +55,7 @@
android:layout_marginStart="3dp"
android:src="@drawable/ic_gender_female" />
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_labour_union/res/layout/list_item_common_group_member.xml b/app/src/module_labour_union/res/layout/list_item_common_group_member.xml
index f172ab438..3dccadb8f 100644
--- a/app/src/module_labour_union/res/layout/list_item_common_group_member.xml
+++ b/app/src/module_labour_union/res/layout/list_item_common_group_member.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_lottery_dialog/java/com/yizhuan/erban/ui/widget/lottery_dialog/LotteryDialog.java b/app/src/module_lottery_dialog/java/com/yizhuan/erban/ui/widget/lottery_dialog/LotteryDialog.java
index 63c9c2e4d..ce1c748a0 100644
--- a/app/src/module_lottery_dialog/java/com/yizhuan/erban/ui/widget/lottery_dialog/LotteryDialog.java
+++ b/app/src/module_lottery_dialog/java/com/yizhuan/erban/ui/widget/lottery_dialog/LotteryDialog.java
@@ -4,7 +4,7 @@ import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
-import android.support.v7.app.AppCompatDialog;
+import androidx.appcompat.app.AppCompatDialog;
import android.view.View;
import android.view.Window;
import android.widget.ImageView;
diff --git a/app/src/module_lottery_dialog/res/layout/lottery_dialog.xml b/app/src/module_lottery_dialog/res/layout/lottery_dialog.xml
index e04f0b648..62c104dba 100644
--- a/app/src/module_lottery_dialog/res/layout/lottery_dialog.xml
+++ b/app/src/module_lottery_dialog/res/layout/lottery_dialog.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/activity/MentoringRelationshipActivity.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/activity/MentoringRelationshipActivity.java
index ae2c4ec40..ab95d7a92 100644
--- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/activity/MentoringRelationshipActivity.java
+++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/activity/MentoringRelationshipActivity.java
@@ -3,9 +3,9 @@ package com.yizhuan.tutu.mentoring_relationship.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.OrientationHelper;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java
index 8b78e0622..9eac13119 100644
--- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java
+++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/BuildMentoringRelationshipSuccessDialog.java
@@ -3,10 +3,10 @@ package com.yizhuan.tutu.mentoring_relationship.dialog;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java
index beab56f9d..3e4c8a04e 100644
--- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java
+++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/GrabApprenticesNoticeDialog.java
@@ -5,11 +5,11 @@ import android.app.Dialog;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.constraint.ConstraintLayout;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java
index 8a4c37eaa..64bc4d188 100644
--- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java
+++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/dialog/ReleaseMentoringRelationshipSuccessDialog.java
@@ -3,10 +3,10 @@ package com.yizhuan.tutu.mentoring_relationship.dialog;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionFourViewHolder.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionFourViewHolder.java
index d78edac8e..f110cceee 100644
--- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionFourViewHolder.java
+++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionFourViewHolder.java
@@ -1,6 +1,6 @@
package com.yizhuan.tutu.mentoring_relationship.viewholder;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.view.View;
import android.widget.TextView;
diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionTwoViewHolder.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionTwoViewHolder.java
index 72fdfdf63..9eb482fb3 100644
--- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionTwoViewHolder.java
+++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/ApprenticeMissionTwoViewHolder.java
@@ -1,7 +1,7 @@
package com.yizhuan.tutu.mentoring_relationship.viewholder;
import android.annotation.SuppressLint;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.style.ForegroundColorSpan;
diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/MasterMissionThreeViewHolder.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/MasterMissionThreeViewHolder.java
index cef4bf364..7401b0d2f 100644
--- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/MasterMissionThreeViewHolder.java
+++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/viewholder/MasterMissionThreeViewHolder.java
@@ -1,12 +1,11 @@
package com.yizhuan.tutu.mentoring_relationship.viewholder;
import android.annotation.SuppressLint;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.style.ForegroundColorSpan;
import android.widget.TextView;
-import android.widget.Toast;
import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper;
import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
diff --git a/app/src/module_mentoring_relationship/res/layout/activity_mentoring_relatinship.xml b/app/src/module_mentoring_relationship/res/layout/activity_mentoring_relatinship.xml
index cfa31de87..821196c86 100644
--- a/app/src/module_mentoring_relationship/res/layout/activity_mentoring_relatinship.xml
+++ b/app/src/module_mentoring_relationship/res/layout/activity_mentoring_relatinship.xml
@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
-
+
-
-
+
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mentoring_relationship/res/layout/dialog_grab_apprentices_notify.xml b/app/src/module_mentoring_relationship/res/layout/dialog_grab_apprentices_notify.xml
index 7fc31d729..7e02c68ac 100644
--- a/app/src/module_mentoring_relationship/res/layout/dialog_grab_apprentices_notify.xml
+++ b/app/src/module_mentoring_relationship/res/layout/dialog_grab_apprentices_notify.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mentoring_relationship/res/layout/item_grab_apprentice.xml b/app/src/module_mentoring_relationship/res/layout/item_grab_apprentice.xml
index 674c471e9..d017cf2dc 100644
--- a/app/src/module_mentoring_relationship/res/layout/item_grab_apprentice.xml
+++ b/app/src/module_mentoring_relationship/res/layout/item_grab_apprentice.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mentoring_relationship/res/layout/item_mission_content.xml b/app/src/module_mentoring_relationship/res/layout/item_mission_content.xml
index 2b1b64230..08e1cfa8c 100644
--- a/app/src/module_mentoring_relationship/res/layout/item_mission_content.xml
+++ b/app/src/module_mentoring_relationship/res/layout/item_mission_content.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mentoring_relationship/res/layout/item_my_master_and_apprentices.xml b/app/src/module_mentoring_relationship/res/layout/item_my_master_and_apprentices.xml
index 3cabe4929..5f3360767 100644
--- a/app/src/module_mentoring_relationship/res/layout/item_my_master_and_apprentices.xml
+++ b/app/src/module_mentoring_relationship/res/layout/item_my_master_and_apprentices.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mentoring_relationship/res/layout/room_mentoring_count_down_timer_view_stub_layout.xml b/app/src/module_mentoring_relationship/res/layout/room_mentoring_count_down_timer_view_stub_layout.xml
index 019fa1e06..cd46e7b46 100644
--- a/app/src/module_mentoring_relationship/res/layout/room_mentoring_count_down_timer_view_stub_layout.xml
+++ b/app/src/module_mentoring_relationship/res/layout/room_mentoring_count_down_timer_view_stub_layout.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_four.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_four.xml
index 558938b54..c6506881a 100644
--- a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_four.xml
+++ b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_four.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_one.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_one.xml
index 871a3170e..11ca67064 100644
--- a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_one.xml
+++ b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_one.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_three.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_three.xml
index 10daf0872..7cd0d8726 100644
--- a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_three.xml
+++ b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_three.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_two.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_two.xml
index 113de0f5a..61f016521 100644
--- a/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_two.xml
+++ b/app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_two.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_four.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_four.xml
index b3669407d..273f0a4c1 100644
--- a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_four.xml
+++ b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_four.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_one.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_one.xml
index 565dce8d7..b5e4adcc6 100644
--- a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_one.xml
+++ b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_one.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_three.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_three.xml
index aacda69a3..c95062279 100644
--- a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_three.xml
+++ b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_three.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_two.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_two.xml
index 1da750dcd..c6911d49a 100644
--- a/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_two.xml
+++ b/app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_two.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mentoring_relationship/res/layout/view_holder_mentoring_sharing_room.xml b/app/src/module_mentoring_relationship/res/layout/view_holder_mentoring_sharing_room.xml
index 470061886..d26b5a56d 100644
--- a/app/src/module_mentoring_relationship/res/layout/view_holder_mentoring_sharing_room.xml
+++ b/app/src/module_mentoring_relationship/res/layout/view_holder_mentoring_sharing_room.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java
index 4b653bbfc..31a68ccfc 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java
@@ -4,9 +4,9 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
+import androidx.viewpager.widget.ViewPager;
import android.view.View;
import com.yizhuan.erban.R;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java
index 25ff7cfb3..a169297f9 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java
@@ -4,12 +4,12 @@ import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AppCompatDialogFragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java
index be16814dc..a3caddfe5 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java
@@ -3,9 +3,9 @@ package com.yizhuan.erban.miniworld.activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
+import androidx.viewpager.widget.ViewPager;
import android.os.Bundle;
import android.view.View;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java
index 6b70c4d2e..0dab1b365 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java
@@ -4,7 +4,7 @@ import android.Manifest;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import android.support.constraint.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintLayout;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java
index b89f1adb3..ad4a3fb2e 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java
@@ -4,16 +4,15 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.AppBarLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.core.content.ContextCompat;
+import androidx.viewpager.widget.ViewPager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java
index bb85452e5..dbaf27705 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java
@@ -7,9 +7,9 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java
index 62d174a07..e7879cb19 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java
@@ -3,9 +3,9 @@ package com.yizhuan.erban.miniworld.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java
index 426fb9f8b..14edd7981 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java
@@ -5,9 +5,9 @@ import android.content.Intent;
import android.graphics.Color;
import android.graphics.Rect;
import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
@@ -17,7 +17,6 @@ import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
-import android.widget.Toast;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.yizhuan.erban.R;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java
index 458792221..9bffb20cb 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java
@@ -4,11 +4,11 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.Typeface;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.AppBarLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import com.google.android.material.appbar.AppBarLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AllTopicListAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AllTopicListAdapter.java
index d4c85215b..0b9bbd77b 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AllTopicListAdapter.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AllTopicListAdapter.java
@@ -1,6 +1,6 @@
package com.yizhuan.erban.miniworld.adapter;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java
index 629b87013..ab337c637 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.miniworld.adapter;
import android.content.Context;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java
index 3cc9a69e9..5cd9ab17d 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java
@@ -1,8 +1,8 @@
package com.yizhuan.erban.miniworld.adapter;
import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.view.ViewGroup;
import android.widget.ImageView;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java
index 1145a90e2..8a6575461 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java
@@ -1,8 +1,8 @@
package com.yizhuan.erban.miniworld.adapter;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.widget.ImageView;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java
index c979a2f5b..e4b43f2cc 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java
@@ -1,6 +1,6 @@
package com.yizhuan.erban.miniworld.adapter;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
import android.text.TextUtils;
import android.widget.ImageView;
import android.widget.TextView;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java
index f81238fc1..cafce7d13 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java
@@ -4,8 +4,8 @@ package com.yizhuan.erban.miniworld.adapter;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/RecommendTopicListAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/RecommendTopicListAdapter.java
index 35d39a890..740659fcb 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/RecommendTopicListAdapter.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/RecommendTopicListAdapter.java
@@ -1,9 +1,7 @@
package com.yizhuan.erban.miniworld.adapter;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.text.TextUtils;
+import androidx.annotation.Nullable;
+
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -11,10 +9,8 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo;
-import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import java.util.List;
-import java.util.Locale;
/**
* 小世界列表界面
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java
index da66ebf12..5085bc8bc 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java
@@ -4,10 +4,10 @@ package com.yizhuan.erban.miniworld.fragment;
import android.app.Activity;
import android.graphics.Rect;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -15,7 +15,6 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpFragment;
import com.yizhuan.erban.common.NoDataFragment;
import com.yizhuan.erban.miniworld.activity.MiniWorldActivity;
-import com.yizhuan.erban.miniworld.activity.MiniWorldGuestPageActivity;
import com.yizhuan.erban.miniworld.activity.TopicMainActivity;
import com.yizhuan.erban.miniworld.adapter.AllTopicListAdapter;
import com.yizhuan.erban.miniworld.listener.DoubleClickCheckListener;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldNoticeFrg.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldNoticeFrg.java
index 0dea11d30..2adaa2cc5 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldNoticeFrg.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldNoticeFrg.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.miniworld.fragment;
import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.text.TextUtils;
import android.view.View;
import android.widget.ScrollView;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java
index 77d33e6eb..1a0b92561 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java
@@ -1,6 +1,6 @@
package com.yizhuan.erban.miniworld.view;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import com.yizhuan.erban.miniworld.viewmodel.MiniWorldDetailInfoVM;
import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java
index af5b697e8..73f3664f4 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java
@@ -2,13 +2,12 @@ package com.yizhuan.erban.miniworld.widget;
import android.content.Context;
import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.RequiresApi;
+import androidx.core.content.ContextCompat;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import com.yizhuan.erban.R;
-import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView;
import com.yizhuan.erban.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java
index ecbc33462..9fcb1dfd3 100644
--- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java
+++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java
@@ -3,12 +3,12 @@ package com.yizhuan.erban.miniworld.widget;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.BottomSheetDialogFragment;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/module_mini_world/res/layout/activity_all_topic.xml b/app/src/module_mini_world/res/layout/activity_all_topic.xml
index f2e5370f9..1c1d925f8 100644
--- a/app/src/module_mini_world/res/layout/activity_all_topic.xml
+++ b/app/src/module_mini_world/res/layout/activity_all_topic.xml
@@ -27,7 +27,7 @@
android:visibility="gone"
android:background="@color/white" />
-
-
-
@@ -183,7 +183,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@id/etv_world_edit_notice" />
-
-
+
-
+
diff --git a/app/src/module_mini_world/res/layout/activity_mini_world_guest_page.xml b/app/src/module_mini_world/res/layout/activity_mini_world_guest_page.xml
index de50e6d75..ea94364a8 100644
--- a/app/src/module_mini_world/res/layout/activity_mini_world_guest_page.xml
+++ b/app/src/module_mini_world/res/layout/activity_mini_world_guest_page.xml
@@ -1,5 +1,5 @@
-
-
-
-
-
-
-
+
-
+
-
+
-
-
-
+
-
+
-
+
diff --git a/app/src/module_mini_world/res/layout/activity_mini_world_main.xml b/app/src/module_mini_world/res/layout/activity_mini_world_main.xml
index 6ee996715..259f9c7b4 100644
--- a/app/src/module_mini_world/res/layout/activity_mini_world_main.xml
+++ b/app/src/module_mini_world/res/layout/activity_mini_world_main.xml
@@ -68,7 +68,7 @@
-
@@ -77,13 +77,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
+
-
+
diff --git a/app/src/module_mini_world/res/layout/activity_mini_world_member_list.xml b/app/src/module_mini_world/res/layout/activity_mini_world_member_list.xml
index 5657786f6..b8f7cf3c8 100644
--- a/app/src/module_mini_world/res/layout/activity_mini_world_member_list.xml
+++ b/app/src/module_mini_world/res/layout/activity_mini_world_member_list.xml
@@ -71,17 +71,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
diff --git a/app/src/module_mini_world/res/layout/activity_mini_world_search.xml b/app/src/module_mini_world/res/layout/activity_mini_world_search.xml
index 21be9ee4d..f56327dd7 100644
--- a/app/src/module_mini_world/res/layout/activity_mini_world_search.xml
+++ b/app/src/module_mini_world/res/layout/activity_mini_world_search.xml
@@ -84,17 +84,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
-
-
+
+
diff --git a/app/src/module_mini_world/res/layout/activity_topic_main.xml b/app/src/module_mini_world/res/layout/activity_topic_main.xml
index c67f279f8..9247ca6b5 100644
--- a/app/src/module_mini_world/res/layout/activity_topic_main.xml
+++ b/app/src/module_mini_world/res/layout/activity_topic_main.xml
@@ -1,5 +1,5 @@
-
-
-
-
-
-
+
-
+
-
+
-
-
-
+
-
+
-
+
diff --git a/app/src/module_mini_world/res/layout/dialog_audio_party.xml b/app/src/module_mini_world/res/layout/dialog_audio_party.xml
index aedc45467..d84ce4ae3 100644
--- a/app/src/module_mini_world/res/layout/dialog_audio_party.xml
+++ b/app/src/module_mini_world/res/layout/dialog_audio_party.xml
@@ -31,19 +31,19 @@
android:layout_height="1px"
android:background="@color/color_f0f0f0"/>
-
-
-
+
-
-
-
+
-
-
+
-
-
-
+
diff --git a/app/src/module_mini_world/res/layout/frg_mini_world_notice.xml b/app/src/module_mini_world/res/layout/frg_mini_world_notice.xml
index 2461cbc37..e89bab4ad 100644
--- a/app/src/module_mini_world/res/layout/frg_mini_world_notice.xml
+++ b/app/src/module_mini_world/res/layout/frg_mini_world_notice.xml
@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
-
-
-
+
-
+
diff --git a/app/src/module_mini_world/res/layout/item_all_topic_list.xml b/app/src/module_mini_world/res/layout/item_all_topic_list.xml
index 75bfa1712..8627d694f 100644
--- a/app/src/module_mini_world/res/layout/item_all_topic_list.xml
+++ b/app/src/module_mini_world/res/layout/item_all_topic_list.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mini_world/res/layout/item_guest_audio_party.xml b/app/src/module_mini_world/res/layout/item_guest_audio_party.xml
index bce391873..a6ffd0cb6 100644
--- a/app/src/module_mini_world/res/layout/item_guest_audio_party.xml
+++ b/app/src/module_mini_world/res/layout/item_guest_audio_party.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mini_world/res/layout/item_mini_world_list.xml b/app/src/module_mini_world/res/layout/item_mini_world_list.xml
index 7e59df375..826a81062 100644
--- a/app/src/module_mini_world/res/layout/item_mini_world_list.xml
+++ b/app/src/module_mini_world/res/layout/item_mini_world_list.xml
@@ -1,5 +1,5 @@
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mini_world/res/layout/item_mini_world_main_find.xml b/app/src/module_mini_world/res/layout/item_mini_world_main_find.xml
index 468f02c58..8a026bbce 100644
--- a/app/src/module_mini_world/res/layout/item_mini_world_main_find.xml
+++ b/app/src/module_mini_world/res/layout/item_mini_world_main_find.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mini_world/res/layout/item_mini_world_main_item.xml b/app/src/module_mini_world/res/layout/item_mini_world_main_item.xml
index 1dd90a6c0..61efe6fa5 100644
--- a/app/src/module_mini_world/res/layout/item_mini_world_main_item.xml
+++ b/app/src/module_mini_world/res/layout/item_mini_world_main_item.xml
@@ -1,5 +1,5 @@
-
-
+
diff --git a/app/src/module_mini_world/res/layout/item_mini_world_main_placeholder.xml b/app/src/module_mini_world/res/layout/item_mini_world_main_placeholder.xml
index 0ff1336d7..8d2e7f0c8 100644
--- a/app/src/module_mini_world/res/layout/item_mini_world_main_placeholder.xml
+++ b/app/src/module_mini_world/res/layout/item_mini_world_main_placeholder.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mini_world/res/layout/item_mini_world_member_list.xml b/app/src/module_mini_world/res/layout/item_mini_world_member_list.xml
index ed0521727..e2da4d3c4 100644
--- a/app/src/module_mini_world/res/layout/item_mini_world_member_list.xml
+++ b/app/src/module_mini_world/res/layout/item_mini_world_member_list.xml
@@ -89,7 +89,7 @@
android:gravity="center_vertical|start"
android:orientation="horizontal">
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mini_world/res/layout/layout_mini_world_main_guide.xml b/app/src/module_mini_world/res/layout/layout_mini_world_main_guide.xml
index cf590b184..d1f9342fa 100644
--- a/app/src/module_mini_world/res/layout/layout_mini_world_main_guide.xml
+++ b/app/src/module_mini_world/res/layout/layout_mini_world_main_guide.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mini_world/res/layout/menu_mini_world_guest_page.xml b/app/src/module_mini_world/res/layout/menu_mini_world_guest_page.xml
index d8fb3247f..61a4490a4 100644
--- a/app/src/module_mini_world/res/layout/menu_mini_world_guest_page.xml
+++ b/app/src/module_mini_world/res/layout/menu_mini_world_guest_page.xml
@@ -1,6 +1,6 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml b/app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml
index 0d3ccea4f..1cbfe6eab 100644
--- a/app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml
+++ b/app/src/module_mini_world/res/layout/nim_recent_contact_team_list_item.xml
@@ -27,7 +27,7 @@
android:layout_centerInParent="true"
tools:src="@drawable/default_user_head" />
-
-
-
-
-
-
+
-
diff --git a/app/src/module_music/res/layout/fragment_music_list.xml b/app/src/module_music/res/layout/fragment_music_list.xml
index 8cb834d63..ca46e276f 100644
--- a/app/src/module_music/res/layout/fragment_music_list.xml
+++ b/app/src/module_music/res/layout/fragment_music_list.xml
@@ -114,7 +114,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
diff --git a/app/src/module_music/res/layout/fragment_share_music_list.xml b/app/src/module_music/res/layout/fragment_share_music_list.xml
index 5907dc109..ed9f06908 100644
--- a/app/src/module_music/res/layout/fragment_share_music_list.xml
+++ b/app/src/module_music/res/layout/fragment_share_music_list.xml
@@ -79,7 +79,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- {
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java
index d537f5781..1f6c60698 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.public_chat_hall.adapter;
import android.app.Activity;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
import android.text.TextUtils;
import android.view.View;
import android.widget.CheckBox;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallMsgAdapter.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallMsgAdapter.java
index 405e10d3f..a2510a7ea 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallMsgAdapter.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallMsgAdapter.java
@@ -1,6 +1,6 @@
package com.yizhuan.erban.public_chat_hall.adapter;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.netease.nim.uikit.business.session.module.Container;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallAttentionFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallAttentionFragment.java
index 40bb31aed..1588a4e74 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallAttentionFragment.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallAttentionFragment.java
@@ -1,11 +1,11 @@
package com.yizhuan.erban.public_chat_hall.fragment;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.widget.CheckBox;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFansListFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFansListFragment.java
index 827dd6508..2c5154049 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFansListFragment.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFansListFragment.java
@@ -2,11 +2,11 @@ package com.yizhuan.erban.public_chat_hall.fragment;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.widget.CheckBox;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFriendListFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFriendListFragment.java
index 929c005bd..c3c715987 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFriendListFragment.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFriendListFragment.java
@@ -1,10 +1,10 @@
package com.yizhuan.erban.public_chat_hall.fragment;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseFragment;
@@ -23,10 +23,7 @@ import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
-import java.util.LinkedHashMap;
import java.util.List;
-import java.util.Map;
-import java.util.Set;
import io.reactivex.SingleObserver;
import io.reactivex.disposables.Disposable;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java
index 1d11527d2..960ba9588 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java
@@ -1,18 +1,16 @@
package com.yizhuan.erban.public_chat_hall.fragment;
import android.annotation.SuppressLint;
-import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.style.ForegroundColorSpan;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.Toast;
import com.netease.nim.uikit.api.NimUIKit;
import com.netease.nim.uikit.api.model.chatroom.ChatRoomSessionCustomization;
@@ -21,7 +19,6 @@ import com.netease.nim.uikit.business.ait.event.AitContactAddEvent;
import com.netease.nim.uikit.business.ait.event.AitContactDeleteEvent;
import com.netease.nim.uikit.business.chatroom.helper.ChatRoomHelper;
import com.netease.nim.uikit.business.session.actions.BaseAction;
-import com.netease.nim.uikit.business.session.event.MessageEvent;
import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper;
import com.netease.nim.uikit.business.session.module.Container;
import com.netease.nim.uikit.business.session.module.ModuleProxy;
@@ -31,7 +28,6 @@ import com.netease.nim.uikit.impl.NimUIKitImpl;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.NIMSDK;
import com.netease.nimlib.sdk.RequestCallbackWrapper;
-import com.netease.nimlib.sdk.ResponseCode;
import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
import com.netease.nimlib.sdk.msg.MessageBuilder;
@@ -55,7 +51,6 @@ import com.yizhuan.erban.public_chat_hall.utils.RemainCountManager;
import com.yizhuan.erban.public_chat_hall.widget.PublicChatHallGiftAnimationDialog;
import com.yizhuan.erban.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper;
import com.yizhuan.erban.ui.login.BinderPhoneActivity;
-import com.yizhuan.erban.ui.pay.ChargeActivity;
import com.yizhuan.erban.ui.widget.GiftDialog;
import com.yizhuan.erban.ui.widget.UserInfoDialog;
import com.yizhuan.erban.ui.widget.dialog.OpenNobleDialog;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java
index 05171a7d8..1fd92cd2f 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java
@@ -1,11 +1,11 @@
package com.yizhuan.erban.public_chat_hall.fragment;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyMessageFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyMessageFragment.java
index 01d8483c3..31b3f2927 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyMessageFragment.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyMessageFragment.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.public_chat_hall.fragment;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
import com.flyco.tablayout.listener.OnTabSelectListener;
import com.yizhuan.erban.R;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallMessageListPanel.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallMessageListPanel.java
index 9382040d7..2b86fad49 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallMessageListPanel.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallMessageListPanel.java
@@ -6,8 +6,8 @@ import android.content.Intent;
import android.net.Uri;
import android.os.CountDownTimer;
import android.os.Handler;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
@@ -16,7 +16,6 @@ import com.netease.nim.uikit.api.NimUIKit;
import com.netease.nim.uikit.business.preference.UserPreferences;
import com.netease.nim.uikit.business.robot.parser.elements.group.LinkElement;
import com.netease.nim.uikit.business.session.audio.MessageAudioControl;
-import com.netease.nim.uikit.business.session.event.MessageEvent;
import com.netease.nim.uikit.business.session.module.Container;
import com.netease.nim.uikit.business.session.viewholder.robot.RobotLinkView;
import com.netease.nim.uikit.common.ui.dialog.EasyAlertDialog;
@@ -55,8 +54,6 @@ import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDat
import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import org.greenrobot.eventbus.EventBus;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseFetchLoadAdapter.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseFetchLoadAdapter.java
index 0e84f7d07..5e892d9de 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseFetchLoadAdapter.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseFetchLoadAdapter.java
@@ -2,11 +2,11 @@ package com.yizhuan.erban.public_chat_hall.msg;
import android.animation.Animator;
import android.content.Context;
-import android.support.annotation.IntDef;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.annotation.IntDef;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseMultiItemFetchLoadAdapter.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseMultiItemFetchLoadAdapter.java
index d7ff89b23..494d212ce 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseMultiItemFetchLoadAdapter.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseMultiItemFetchLoadAdapter.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.public_chat_hall.msg;
-import android.support.annotation.LayoutRes;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.LayoutRes;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.SparseArray;
import android.view.ViewGroup;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseViewHolder.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseViewHolder.java
index 5299f44c1..db7acc1b8 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseViewHolder.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/BaseViewHolder.java
@@ -6,9 +6,9 @@ import android.graphics.Paint;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.util.Linkify;
import android.util.SparseArray;
import android.view.View;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/IncomingMsgPrompt.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/IncomingMsgPrompt.java
index a16cf4d97..4e93f8581 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/IncomingMsgPrompt.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/IncomingMsgPrompt.java
@@ -2,7 +2,7 @@ package com.yizhuan.erban.public_chat_hall.msg;
import android.content.Context;
import android.os.Handler;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.text.style.ImageSpan;
import android.view.View;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/LoadMoreView.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/LoadMoreView.java
index 8f03035af..cc6a4b56b 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/LoadMoreView.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/LoadMoreView.java
@@ -1,7 +1,7 @@
package com.yizhuan.erban.public_chat_hall.msg;
-import android.support.annotation.IdRes;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
public abstract class LoadMoreView {
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/RecyclerViewHolder.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/RecyclerViewHolder.java
index 06195d563..1bd896ea2 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/RecyclerViewHolder.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/RecyclerViewHolder.java
@@ -1,6 +1,6 @@
package com.yizhuan.erban.public_chat_hall.msg;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
/**
* Created by huangjun on 2016/12/11.
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/SimpleClickListener.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/SimpleClickListener.java
index 627e082e3..539a3557b 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/SimpleClickListener.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/SimpleClickListener.java
@@ -1,8 +1,8 @@
package com.yizhuan.erban.public_chat_hall.msg;
import android.os.Build;
-import android.support.v4.view.GestureDetectorCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.GestureDetector;
import android.view.HapticFeedbackConstants;
import android.view.MotionEvent;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java
index 6b47c4b36..e1a7e26fe 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java
@@ -1,6 +1,6 @@
package com.yizhuan.erban.public_chat_hall.msg.viewholder;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.method.LinkMovementMethod;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGame.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGame.java
index 742a46d36..8f006bc1e 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGame.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGame.java
@@ -1,23 +1,15 @@
package com.yizhuan.erban.public_chat_hall.msg.viewholder;
import android.annotation.SuppressLint;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
import android.view.Gravity;
import android.view.View;
import android.widget.LinearLayout;
-import com.alibaba.fastjson.JSONObject;
-import com.google.gson.Gson;
-import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase;
-import com.netease.nim.uikit.common.util.log.LogUtil;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
-import com.netease.nimlib.sdk.msg.MessageBuilder;
import com.netease.nimlib.sdk.msg.MsgService;
-import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
-import com.netease.nimlib.sdk.msg.model.CustomNotification;
-import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.game.PlayGameActivity;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
@@ -28,13 +20,11 @@ import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.GameRespondAttachment;
import com.yizhuan.xchat_android_core.im.custom.bean.ImGameAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.ImTipAttachment;
import com.yizhuan.xchat_android_core.im.game.ImGameInfo;
import com.yizhuan.xchat_android_core.im.game.ImGameMode;
import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager;
import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel;
import com.yizhuan.xchat_android_core.room.game.CancelGameEvent;
-import com.yizhuan.xchat_android_core.room.game.GameModel;
import com.yizhuan.xchat_android_core.room.game.GameUrlInfo;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
@@ -45,8 +35,6 @@ import com.yizhuan.xchat_android_library.rxbus.RxBus;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import io.reactivex.functions.Consumer;
-
public class ChatRoomMsgViewHolderGame extends ChatRoomMsgViewHolderBase {
private ItemImGameBinding mBinding;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java
index 7185fcf1e..d167f86c7 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java
@@ -1,6 +1,6 @@
package com.yizhuan.erban.public_chat_hall.msg.viewholder;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.widget.ImageView;
import android.widget.TextView;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderText.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderText.java
index dc40b544e..4d958b165 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderText.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderText.java
@@ -1,6 +1,6 @@
package com.yizhuan.erban.public_chat_hall.msg.viewholder;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.text.method.LinkMovementMethod;
import android.text.style.ImageSpan;
import android.widget.TextView;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java
index 8b4782512..51e42b038 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java
@@ -1,8 +1,7 @@
package com.yizhuan.erban.public_chat_hall.msg.viewholder;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
-import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase;
import com.yizhuan.erban.R;
import com.yizhuan.erban.databinding.ItemImTipsBinding;
import com.yizhuan.erban.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java
index 8a83aa741..9de40a321 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java
@@ -1,6 +1,6 @@
package com.yizhuan.erban.public_chat_hall.msg.viewholder;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.style.ForegroundColorSpan;
diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java
index 52b54a511..1c3dd423d 100644
--- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java
+++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java
@@ -12,6 +12,8 @@ import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+
import com.opensource.svgaplayer.SVGADrawable;
import com.opensource.svgaplayer.SVGAImageView;
import com.opensource.svgaplayer.SVGAParser;
@@ -25,9 +27,6 @@ import com.yizhuan.xchat_android_core.gift.GiftModel;
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo;
import com.yizhuan.xchat_android_core.utils.ActivityUtil;
-
-import org.jetbrains.annotations.NotNull;
-
import java.net.MalformedURLException;
import java.net.URL;
@@ -106,7 +105,7 @@ public class PublicChatHallGiftAnimationDialog extends BaseSdDialog {
try {
svgaParser.parse(new URL("https://img.erbanyy.com/public_chat_spring.svga"), new SVGAParser.ParseCompletion() {
@Override
- public void onComplete(@NotNull SVGAVideoEntity svgaVideoEntity) {
+ public void onComplete(@Nullable SVGAVideoEntity svgaVideoEntity) {
SVGADrawable drawable = new SVGADrawable(svgaVideoEntity);
svgaImageView.setImageDrawable(drawable);
svgaImageView.startAnimation();
diff --git a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml
index 4b78d8c18..4d3dfefc7 100644
--- a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml
+++ b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml
@@ -16,7 +16,7 @@
android:fitsSystemWindows="true"
android:orientation="vertical">
-
-
+
-
diff --git a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_ait_friends.xml b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_ait_friends.xml
index ede4cba42..15a2f6941 100644
--- a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_ait_friends.xml
+++ b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_ait_friends.xml
@@ -58,7 +58,7 @@
app:tl_textUnselectColor="@color/text_tertiary"
app:tl_textsize="@dimen/dp_16" />
-
-
-
+
-
diff --git a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_search_friends.xml b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_search_friends.xml
index 1a21f4cf1..64ee8096c 100644
--- a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_search_friends.xml
+++ b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall_search_friends.xml
@@ -90,12 +90,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
-
-
+
\ No newline at end of file
diff --git a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_attention.xml b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_attention.xml
index c9bc70565..11e56af31 100644
--- a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_attention.xml
+++ b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_attention.xml
@@ -3,18 +3,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
+
\ No newline at end of file
diff --git a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message.xml b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message.xml
index 06636a522..bc754760a 100644
--- a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message.xml
+++ b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_message.xml
@@ -28,7 +28,7 @@
android:layout_height="match_parent"
android:layout_above="@id/messageActivityBottomLayout">
-
-
-
-
+
diff --git a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_my_mesage.xml b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_my_mesage.xml
index 95fba8358..bbc7e967a 100644
--- a/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_my_mesage.xml
+++ b/app/src/module_public_chat_hall/res/layout/fragment_public_chat_hall_my_mesage.xml
@@ -36,7 +36,7 @@
app:tl_textsize="@dimen/dp_14" />
-
diff --git a/app/src/module_public_chat_hall/res/layout/item_im_game.xml b/app/src/module_public_chat_hall/res/layout/item_im_game.xml
index 5f8ccd0e6..91a354615 100644
--- a/app/src/module_public_chat_hall/res/layout/item_im_game.xml
+++ b/app/src/module_public_chat_hall/res/layout/item_im_game.xml
@@ -9,7 +9,7 @@
type="com.yizhuan.xchat_android_core.room.game.GameInfo" />
-
-
+
\ No newline at end of file
diff --git a/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_attention_list.xml b/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_attention_list.xml
index eca5d00ee..c5dc52439 100644
--- a/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_attention_list.xml
+++ b/app/src/module_public_chat_hall/res/layout/item_public_chat_hall_attention_list.xml
@@ -61,7 +61,7 @@
android:textSize="15sp"
tools:text="我的" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_quick_pass/res/layout/fragment_add_user_info_old.xml b/app/src/module_quick_pass/res/layout/fragment_add_user_info_old.xml
index 0ae50139c..6c595d1be 100644
--- a/app/src/module_quick_pass/res/layout/fragment_add_user_info_old.xml
+++ b/app/src/module_quick_pass/res/layout/fragment_add_user_info_old.xml
@@ -1,5 +1,5 @@
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomMsgActivity.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomMsgActivity.java
index e052a3da6..5977623a1 100644
--- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomMsgActivity.java
+++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/activity/RoomMsgActivity.java
@@ -4,8 +4,8 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
import android.text.TextUtils;
import com.flyco.tablayout.SlidingTabLayout;
diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgRecentContactAdapter.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgRecentContactAdapter.java
index d2e538782..e8e9717d8 100644
--- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgRecentContactAdapter.java
+++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgRecentContactAdapter.java
@@ -1,6 +1,6 @@
package com.yizhuan.tutu.room_chat.adapter;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import com.netease.nim.uikit.business.recent.RecentContactsCallback;
import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemQuickAdapter;
diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgAttentionFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgAttentionFragment.java
index 51c30f98e..b78e56705 100644
--- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgAttentionFragment.java
+++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgAttentionFragment.java
@@ -1,10 +1,10 @@
package com.yizhuan.tutu.room_chat.fragment;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.yizhuan.erban.R;
diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java
index 1dd9c0a8a..2e2a5cbf7 100644
--- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java
+++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java
@@ -3,10 +3,10 @@ package com.yizhuan.tutu.room_chat.fragment;
import android.annotation.SuppressLint;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.yizhuan.erban.R;
diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFriendListFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFriendListFragment.java
index 527ed2283..1b02ea9c2 100644
--- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFriendListFragment.java
+++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFriendListFragment.java
@@ -1,10 +1,10 @@
package com.yizhuan.tutu.room_chat.fragment;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.orhanobut.logger.Logger;
diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentContactsFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentContactsFragment.java
index 55dcfd679..3d80c6277 100644
--- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentContactsFragment.java
+++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentContactsFragment.java
@@ -1,15 +1,14 @@
package com.yizhuan.tutu.room_chat.fragment;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
-import android.widget.Toast;
import com.netease.nim.uikit.api.NimUIKit;
import com.netease.nim.uikit.api.model.contact.ContactChangedObserver;
diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java
index e296d5691..d65dee3d8 100644
--- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java
+++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java
@@ -1,9 +1,9 @@
package com.yizhuan.tutu.room_chat.fragment;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
import android.text.TextUtils;
import com.google.gson.Gson;
diff --git a/app/src/module_room_chat/res/layout/activity_room_message.xml b/app/src/module_room_chat/res/layout/activity_room_message.xml
index 8692ebdc9..982c0e923 100644
--- a/app/src/module_room_chat/res/layout/activity_room_message.xml
+++ b/app/src/module_room_chat/res/layout/activity_room_message.xml
@@ -33,7 +33,7 @@
android:layout_height="1px"
android:background="@color/color_f5f5f5" />
-
diff --git a/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml b/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml
index f8330537b..a3866d4c3 100644
--- a/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml
+++ b/app/src/module_room_chat/res/layout/room_msg_nim_recent_contact_list_item.xml
@@ -13,7 +13,7 @@
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_10" />
-
-
-
-
-
-
+
diff --git a/app/src/module_super_admin/res/layout/activity_room_s_admin_manager.xml b/app/src/module_super_admin/res/layout/activity_room_s_admin_manager.xml
index 978f412f6..73d270beb 100644
--- a/app/src/module_super_admin/res/layout/activity_room_s_admin_manager.xml
+++ b/app/src/module_super_admin/res/layout/activity_room_s_admin_manager.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeActivity.java
index 3a08dae00..5c62c6ba6 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeActivity.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeActivity.java
@@ -2,8 +2,8 @@ package com.yizhuan.erban.treasure_box.activity;
import android.content.Context;
import android.content.Intent;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeRecordActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeRecordActivity.java
index e0bbb7883..1fd1ccd6f 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeRecordActivity.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxPrizeRecordActivity.java
@@ -2,8 +2,8 @@ package com.yizhuan.erban.treasure_box.activity;
import android.content.Context;
import android.content.Intent;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeActivity.java
index 7e005d917..20cca8c48 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeActivity.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeActivity.java
@@ -2,8 +2,8 @@ package com.yizhuan.erban.treasure_box.activity;
import android.content.Context;
import android.content.Intent;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
import android.view.View;
import android.view.ViewGroup;
@@ -11,7 +11,6 @@ import com.yizhuan.erban.BR;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.bindadapter.BaseAdapter;
-import com.yizhuan.erban.databinding.ActivityBoxPrizeBinding;
import com.yizhuan.erban.databinding.ActivityHonourBoxPrizeBinding;
import com.yizhuan.erban.treasure_box.widget.PrizeVm;
import com.yizhuan.treasure_box.bean.PrizeInfo;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeRecordActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeRecordActivity.java
index a82d305da..59be501a6 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeRecordActivity.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/HonourBoxPrizeRecordActivity.java
@@ -2,8 +2,8 @@ package com.yizhuan.erban.treasure_box.activity;
import android.content.Context;
import android.content.Intent;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
import android.view.View;
import android.view.ViewGroup;
@@ -11,7 +11,6 @@ import com.flyco.tablayout.listener.OnTabSelectListener;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.common.ViewPagerAdapter;
-import com.yizhuan.erban.databinding.ActivityBoxPrizeRecordBinding;
import com.yizhuan.erban.databinding.ActivityHonourBoxPrizeRecordBinding;
import com.yizhuan.erban.treasure_box.fragment.PrizeRecordFragment;
import com.yizhuan.erban.treasure_box.fragment.PrizeRecordSecondFragment;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java
index e66c1f3ec..bb5c46ca7 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java
@@ -2,9 +2,9 @@ package com.yizhuan.erban.treasure_box.fragment;
import android.app.Dialog;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.view.Gravity;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordFragment.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordFragment.java
index 355291c13..3f6a890ec 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordFragment.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordFragment.java
@@ -1,8 +1,8 @@
package com.yizhuan.erban.treasure_box.fragment;
import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
import android.view.View;
import android.widget.TextView;
@@ -14,7 +14,6 @@ import com.yizhuan.erban.bindadapter.BaseAdapter;
import com.yizhuan.erban.databinding.FragmentRecyclerViewBindNoBgBinding;
import com.yizhuan.erban.treasure_box.widget.PrizeRecordVm;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
-import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
import com.yizhuan.treasure_box.bean.PrizeInfo;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordSecondFragment.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordSecondFragment.java
index ac9fb1fea..6b66c7968 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordSecondFragment.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/PrizeRecordSecondFragment.java
@@ -1,8 +1,8 @@
package com.yizhuan.erban.treasure_box.fragment;
import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.LinearLayoutManager;
import android.view.View;
import android.widget.TextView;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenBoxService.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenBoxService.java
index 506216c1c..ab12918a5 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenBoxService.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenBoxService.java
@@ -4,7 +4,7 @@ import android.app.Service;
import android.content.Context;
import android.content.Intent;
import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.yizhuan.treasure_box.model.BoxModel;
import com.yizhuan.xchat_android_core.exception.FailReasonException;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenHonourBoxService.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenHonourBoxService.java
index 0da2a0e0c..69bf9c95b 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenHonourBoxService.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/service/OpenHonourBoxService.java
@@ -4,14 +4,13 @@ import android.app.Service;
import android.content.Context;
import android.content.Intent;
import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.yizhuan.treasure_box.event.AutoOpenHonourBoxEvent;
import com.yizhuan.treasure_box.model.BoxModel;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.exception.FailReasonException;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
-import com.yizhuan.treasure_box.event.AutoOpenBoxEvent;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/PrizeCover.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/PrizeCover.java
index dc7fff099..5741f8dd6 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/PrizeCover.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/PrizeCover.java
@@ -3,7 +3,7 @@ package com.yizhuan.erban.treasure_box.widget;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BaseBindingDialog.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BaseBindingDialog.java
index ce792ad27..deea546ed 100644
--- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BaseBindingDialog.java
+++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BaseBindingDialog.java
@@ -1,12 +1,12 @@
package com.yizhuan.erban.treasure_box.widget.dialog;
import android.content.Context;
-import android.databinding.DataBindingUtil;
-import android.databinding.ViewDataBinding;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
-import android.support.v7.app.AppCompatDialog;
+import androidx.appcompat.app.AppCompatDialog;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -14,7 +14,6 @@ import android.view.Window;
import android.view.WindowManager;
import com.netease.nim.uikit.common.util.sys.ScreenUtil;
-import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes;
/**
diff --git a/app/src/module_treasure_box/res/layout/activity_box_help.xml b/app/src/module_treasure_box/res/layout/activity_box_help.xml
index e46f48e2a..121ab423d 100644
--- a/app/src/module_treasure_box/res/layout/activity_box_help.xml
+++ b/app/src/module_treasure_box/res/layout/activity_box_help.xml
@@ -10,7 +10,7 @@
type="android.view.View.OnClickListener" />
-
-
+
\ No newline at end of file
diff --git a/app/src/module_treasure_box/res/layout/activity_box_prize.xml b/app/src/module_treasure_box/res/layout/activity_box_prize.xml
index b559caba2..272ac5fb6 100644
--- a/app/src/module_treasure_box/res/layout/activity_box_prize.xml
+++ b/app/src/module_treasure_box/res/layout/activity_box_prize.xml
@@ -14,7 +14,7 @@
type="com.yizhuan.erban.base.BaseListViewModel" />
-
-
-
-
+
-
+
\ No newline at end of file
diff --git a/app/src/module_treasure_box/res/layout/activity_box_prize_record.xml b/app/src/module_treasure_box/res/layout/activity_box_prize_record.xml
index 993e0d6ce..e790ed765 100644
--- a/app/src/module_treasure_box/res/layout/activity_box_prize_record.xml
+++ b/app/src/module_treasure_box/res/layout/activity_box_prize_record.xml
@@ -10,7 +10,7 @@
type="android.view.View.OnClickListener" />
-
-
-
+
\ No newline at end of file
diff --git a/app/src/module_treasure_box/res/layout/activity_honour_box_help.xml b/app/src/module_treasure_box/res/layout/activity_honour_box_help.xml
index 623fdb4ca..d852cff04 100644
--- a/app/src/module_treasure_box/res/layout/activity_honour_box_help.xml
+++ b/app/src/module_treasure_box/res/layout/activity_honour_box_help.xml
@@ -10,7 +10,7 @@
type="android.view.View.OnClickListener" />
-
-
+
\ No newline at end of file
diff --git a/app/src/module_treasure_box/res/layout/activity_honour_box_prize.xml b/app/src/module_treasure_box/res/layout/activity_honour_box_prize.xml
index 50d2d9654..4b3580b82 100644
--- a/app/src/module_treasure_box/res/layout/activity_honour_box_prize.xml
+++ b/app/src/module_treasure_box/res/layout/activity_honour_box_prize.xml
@@ -14,7 +14,7 @@
type="com.yizhuan.erban.base.BaseListViewModel" />
-
-
-
-
+
-
+
\ No newline at end of file
diff --git a/app/src/module_treasure_box/res/layout/activity_honour_box_prize_record.xml b/app/src/module_treasure_box/res/layout/activity_honour_box_prize_record.xml
index d147fccdb..706cfbd17 100644
--- a/app/src/module_treasure_box/res/layout/activity_honour_box_prize_record.xml
+++ b/app/src/module_treasure_box/res/layout/activity_honour_box_prize_record.xml
@@ -10,7 +10,7 @@
type="android.view.View.OnClickListener" />
-
-
-
+
\ No newline at end of file
diff --git a/app/src/module_treasure_box/res/layout/activity_treasure_box.xml b/app/src/module_treasure_box/res/layout/activity_treasure_box.xml
index a3405e7a9..eeaaa4cf9 100644
--- a/app/src/module_treasure_box/res/layout/activity_treasure_box.xml
+++ b/app/src/module_treasure_box/res/layout/activity_treasure_box.xml
@@ -10,7 +10,7 @@
type="android.view.View.OnClickListener" />
-
-
-
+
diff --git a/app/src/module_treasure_box/res/layout/activity_treasure_box_honour.xml b/app/src/module_treasure_box/res/layout/activity_treasure_box_honour.xml
index 604d48f2d..efb074a36 100644
--- a/app/src/module_treasure_box/res/layout/activity_treasure_box_honour.xml
+++ b/app/src/module_treasure_box/res/layout/activity_treasure_box_honour.xml
@@ -10,7 +10,7 @@
type="android.view.View.OnClickListener" />
-
-
-
+
diff --git a/app/src/module_treasure_box/res/layout/dialog_buy_key.xml b/app/src/module_treasure_box/res/layout/dialog_buy_key.xml
index a8f5a1066..1f9372a3d 100644
--- a/app/src/module_treasure_box/res/layout/dialog_buy_key.xml
+++ b/app/src/module_treasure_box/res/layout/dialog_buy_key.xml
@@ -10,14 +10,14 @@
type="android.view.View.OnClickListener" />
-
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/module_treasure_box/res/layout/dialog_buy_key_honour.xml b/app/src/module_treasure_box/res/layout/dialog_buy_key_honour.xml
index d66229f15..877c7b926 100644
--- a/app/src/module_treasure_box/res/layout/dialog_buy_key_honour.xml
+++ b/app/src/module_treasure_box/res/layout/dialog_buy_key_honour.xml
@@ -10,14 +10,14 @@
type="android.view.View.OnClickListener" />
-
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/module_treasure_box/res/layout/list_item_honour_price.xml b/app/src/module_treasure_box/res/layout/list_item_honour_price.xml
index 36281d15c..333db6f93 100644
--- a/app/src/module_treasure_box/res/layout/list_item_honour_price.xml
+++ b/app/src/module_treasure_box/res/layout/list_item_honour_price.xml
@@ -12,7 +12,7 @@
-
-
+
\ No newline at end of file
diff --git a/app/src/module_treasure_box/res/layout/list_item_price.xml b/app/src/module_treasure_box/res/layout/list_item_price.xml
index 3a6561b33..9133ab717 100644
--- a/app/src/module_treasure_box/res/layout/list_item_price.xml
+++ b/app/src/module_treasure_box/res/layout/list_item_price.xml
@@ -12,7 +12,7 @@
-
-
+
\ No newline at end of file
diff --git a/app/src/module_treasure_box/res/layout/list_item_price_record.xml b/app/src/module_treasure_box/res/layout/list_item_price_record.xml
index 5203f540d..c0f9bd8c8 100644
--- a/app/src/module_treasure_box/res/layout/list_item_price_record.xml
+++ b/app/src/module_treasure_box/res/layout/list_item_price_record.xml
@@ -14,7 +14,7 @@
-
-
+
\ No newline at end of file
diff --git a/app/src/module_treasure_box/res/layout/list_item_price_record_second.xml b/app/src/module_treasure_box/res/layout/list_item_price_record_second.xml
index 3c4a8dded..d2a6bc72f 100644
--- a/app/src/module_treasure_box/res/layout/list_item_price_record_second.xml
+++ b/app/src/module_treasure_box/res/layout/list_item_price_record_second.xml
@@ -14,7 +14,7 @@
-
-
+
\ No newline at end of file
diff --git a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java
index bcddb9147..74b857916 100644
--- a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java
+++ b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java
@@ -3,11 +3,11 @@ package com.tongdaxing.erban.upgrade;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.core.content.ContextCompat;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
diff --git a/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml b/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml
index 62552fbbf..f478f5b8c 100644
--- a/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml
+++ b/app/src/module_upgrade_app/res/layout/dialog_erban_update.xml
@@ -1,5 +1,5 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 8add5b1cb..00bdd0c38 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.1.4'
+ classpath 'com.android.tools.build:gradle:3.2.1'
//realm 数据库插件
classpath "io.realm:realm-gradle-plugin:5.3.0"
// android 资源混淆插件
diff --git a/core/build.gradle b/core/build.gradle
index 292c62bc7..52a7f4493 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -9,7 +9,7 @@ android {
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
flavorDimensions 'default'
}
@@ -87,8 +87,8 @@ android {
}
-def link_page = "1.1.2"
-def loggerVersion = "2.1.1"
+def link_page = "1.1.9"
+def loggerVersion = "2.2.0"
def BaiduMtjVersion = "3.8.2.1"
def Lombok = "1.16.20"
def room_version = "1.1.1"
@@ -98,8 +98,8 @@ def umeng_analytics = "8.1.4"
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
- androidTestImplementation 'com.android.support.test:runner:1.0.2'
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
api "cc.linkedme.deeplinks:link-page:${link_page}"
@@ -139,10 +139,10 @@ dependencies {
// provide okhttp to connect to backend
implementation 'com.liulishuo.okdownload:okhttp:1.0.4'
// Room
- api "android.arch.persistence.room:runtime:${room_version}"
- annotationProcessor "android.arch.persistence.room:compiler:1.1.0"
+ api 'androidx.room:room-runtime:2.2.5'
+ annotationProcessor 'androidx.room:room-compiler:2.2.5'
// RxJava support for Room
- api "android.arch.persistence.room:rxjava2:${room_version}"
+ api 'androidx.room:room-rxjava2:2.2.5'
api project(':nim_uikit')
diff --git a/core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java b/core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java
index 7e75fc350..0084f1221 100644
--- a/core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java
+++ b/core/src/androidTest/java/com/yizhuan/xchat_android_core/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
package com.yizhuan.xchat_android_core;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
index 62a273772..ae314406d 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.manager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.text.TextUtils;
import android.util.Log;
import android.util.SparseArray;
@@ -10,7 +10,6 @@ import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper;
-import com.netease.nim.uikit.business.session.module.Container;
import com.netease.nim.uikit.common.antispam.AntiSpamEvent;
import com.netease.nim.uikit.common.util.AntiSpamUtil;
import com.netease.nim.uikit.common.util.log.LogUtil;
@@ -18,7 +17,6 @@ import com.netease.nimlib.sdk.NIMChatRoomSDK;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.Observer;
import com.netease.nimlib.sdk.RequestCallback;
-import com.netease.nimlib.sdk.RequestCallbackWrapper;
import com.netease.nimlib.sdk.ResponseCode;
import com.netease.nimlib.sdk.StatusCode;
import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
@@ -41,7 +39,6 @@ import com.netease.nimlib.sdk.msg.attachment.NotificationAttachment;
import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
import com.netease.nimlib.sdk.msg.constant.NotificationType;
import com.netease.nimlib.sdk.msg.model.IMMessage;
-import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum;
import com.netease.nimlib.sdk.util.Entry;
import com.netease.nimlib.sdk.util.api.RequestResult;
import com.orhanobut.logger.Logger;
@@ -106,7 +103,6 @@ import com.yizhuan.xchat_android_core.msg.sysv2.ErbanSysMsgV2Info;
import com.yizhuan.xchat_android_core.noble.NobleInfo;
import com.yizhuan.xchat_android_core.noble.NobleResourceType;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
-import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallHistoryEvent;
import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager;
import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean;
diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java
index 622c7f09b..f2c9f8bfc 100644
--- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java
+++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
diff --git a/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java b/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
index adbd787fb..9214ec485 100644
--- a/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
+++ b/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java
@@ -2,7 +2,7 @@ package com.yizhuan.xchat_android_core.manager;
import android.os.Handler;
import android.os.Message;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.text.TextUtils;
import android.util.Log;
import android.util.SparseArray;
diff --git a/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java b/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java
index 916f2a68b..551145a13 100644
--- a/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java
+++ b/core/src/diff_src_haha/java/com/yizhuan/xchat_android_core/manager/RtcEngineManager.java
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
import android.os.Environment;
import android.os.Handler;
import android.os.Message;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java b/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java
index 62ceb933c..5e50e8427 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java
@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_core;
import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import com.google.gson.Gson;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java b/core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java
index f24f8e37e..42ab60ee9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java
@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.exception;
-import android.support.annotation.StringDef;
+import androidx.annotation.StringDef;
/**
*
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java
index aaac2c556..4f8387e22 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java
@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.family.bean;
-import android.support.annotation.DrawableRes;
+import androidx.annotation.DrawableRes;
import lombok.Data;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java
index 9e1da65cf..4323b9ef9 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java
@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_core.family.model;
import android.annotation.SuppressLint;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import com.orhanobut.logger.Logger;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java
index ad9c7c796..8fa6f01f4 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java
@@ -1,9 +1,8 @@
package com.yizhuan.xchat_android_core.family.model;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.yizhuan.xchat_android_core.base.IModel;
-import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.family.bean.FamilyCustomServiceInfo;
import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo;
import com.yizhuan.xchat_android_core.family.bean.FamilyInfo;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java
index 3be5f3c3a..286b48c95 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java
@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.magic;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
import com.yizhuan.xchat_android_core.base.IModel;
@@ -8,7 +8,6 @@ import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
import com.yizhuan.xchat_android_core.magic.bean.MagicInfo;
import com.yizhuan.xchat_android_core.magic.bean.MagicMultiReceiverInfo;
import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo;
-import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo;
import java.util.List;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java
index e1f879585..025c7fc16 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java
@@ -3,7 +3,7 @@ package com.yizhuan.xchat_android_core.magic;
import android.annotation.SuppressLint;
import android.os.Handler;
import android.os.Message;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
@@ -21,7 +21,6 @@ import com.yizhuan.xchat_android_core.pay.PayModel;
import com.yizhuan.xchat_android_core.retry.ImRetryManager;
import com.yizhuan.xchat_android_core.retry.RetryChatRoomMessage;
import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueCommonUpdate;
-import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue;
import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg;
import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption;
import com.yizhuan.xchat_android_core.utils.net.FreezeException;
@@ -43,7 +42,6 @@ import java.util.ArrayList;
import java.util.List;
import io.reactivex.Single;
-import io.reactivex.functions.BiConsumer;
import io.reactivex.functions.Consumer;
import retrofit2.http.Field;
import retrofit2.http.FormUrlEncoded;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java b/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
index 4d3cf9e2d..6581cac3d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java
@@ -3,7 +3,7 @@ package com.yizhuan.xchat_android_core.manager;
import android.annotation.SuppressLint;
import android.graphics.Point;
import android.graphics.drawable.Drawable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
import android.util.SparseArray;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java b/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java
index 19599eb1d..4c6721f8d 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java
@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.noble;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
import android.text.TextUtils;
import android.util.Log;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java b/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java
index 48ee142b2..687e039ec 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java
@@ -11,8 +11,8 @@ import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.NinePatchDrawable;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
@@ -27,10 +27,6 @@ import com.bumptech.glide.request.transition.Transition;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
-import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
-import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.FaceAttachment;
-import com.yizhuan.xchat_android_core.im.custom.bean.RoomTipAttachment;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.ExtensionUtil;
import com.yizhuan.xchat_android_core.utils.ImageSplitter;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java
index 67228073c..181a01a62 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java
@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.room.bean;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import com.chad.library.adapter.base.entity.MultiItemEntity;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
@@ -15,9 +15,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
-import lombok.Getter;
-import lombok.Setter;
-
/**
* 在线用户列表，包装 {@link ChatRoomMember}
*
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java
index 4b317b259..81149a9a7 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java
@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_core.room.giftvalue.bean;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.Observer;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Observer;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/KtvEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/KtvEvent.java
index 62a439862..4d596c86a 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/KtvEvent.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/ktv/event/KtvEvent.java
@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.room.ktv.event;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.yizhuan.xchat_android_core.room.ktv.bean.MusicInfo;
public class KtvEvent {
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java
index b72ff8c36..840310702 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java
@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.room.model;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.text.TextUtils;
import com.netease.nimlib.sdk.chatroom.constant.MemberType;
@@ -16,7 +16,6 @@ import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.model.inteface.IHomePartyUserListModel;
-import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
import com.yizhuan.xchat_android_library.utils.ListUtils;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java
index 858c4d9a4..ec388f777 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java
@@ -1,22 +1,18 @@
package com.yizhuan.xchat_android_core.room.pk.model;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.yizhuan.xchat_android_core.base.IModel;
-import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo;
-import com.yizhuan.xchat_android_core.room.pk.bean.PKQueuingMicMemberInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordListInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKRespQueuingMicListInfo;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
-import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamMember;
import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember;
import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import java.util.List;
-import io.reactivex.FlowableOnSubscribe;
import io.reactivex.Single;
public interface IPkModel extends IModel {
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
index 7ac72301a..dbfe21e75 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
@@ -2,9 +2,8 @@ package com.yizhuan.xchat_android_core.room.pk.model;
import android.annotation.SuppressLint;
import android.os.CountDownTimer;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.SparseArray;
-import android.widget.Toast;
import com.google.gson.Gson;
import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder;
@@ -55,7 +54,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.Set;
import java.util.concurrent.TimeUnit;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomQueueInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomQueueInfo.java
index 0b62a0bfd..5521b7fac 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomQueueInfo.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomQueueInfo.java
@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.room.queue.bean;
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
import com.alibaba.fastjson.JSONObject;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/AliyunLogToken.java b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/AliyunLogToken.java
index a5d28d697..5ff1c9270 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/AliyunLogToken.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/AliyunLogToken.java
@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.statistic;
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
/**
*
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/LogFile.java b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/LogFile.java
index 271c493ae..edb26bb64 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/LogFile.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/LogFile.java
@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.statistic;
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
import com.orhanobut.logger.Logger;
import com.yizhuan.xchat_android_library.utils.FileUtils;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java
index c9bb55b39..34f57183e 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticManager.java
@@ -2,7 +2,7 @@ package com.yizhuan.xchat_android_core.statistic;
import android.annotation.SuppressLint;
import android.content.Context;
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
import android.text.TextUtils;
import com.netease.nim.uikit.common.util.log.LogUtil;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java
index 7283b5834..9daffb934 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatisticModel.java
@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_core.statistic;
import android.content.Context;
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
import com.baidu.mobstat.StatService;
import com.umeng.analytics.MobclickAgent;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java
index 5803cd48e..10724c639 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java
@@ -1,12 +1,11 @@
package com.yizhuan.xchat_android_core.user;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.yizhuan.xchat_android_core.base.IModel;
import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.user.bean.GiftAchievementInfo;
-import com.yizhuan.xchat_android_core.user.bean.LiveTagInfo;
import com.yizhuan.xchat_android_core.user.bean.NewUserInfo;
import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo;
import com.yizhuan.xchat_android_core.user.bean.UserGameInfo;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java
index 2349edb7d..dc25f4b93 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java
@@ -1,13 +1,11 @@
package com.yizhuan.xchat_android_core.user;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.Observer;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Observer;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import org.greenrobot.eventbus.EventBus;
-
/**
* 个人主页/客态页用户信息监听
*/
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java
index 4a1135e17..08f976a5c 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java
@@ -1,8 +1,8 @@
package com.yizhuan.xchat_android_core.user;
import android.annotation.SuppressLint;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.util.LruCache;
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java b/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java
index 82f0f7b67..66a030399 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java
@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_core.utils;
import android.graphics.Bitmap;
-import android.support.v4.util.LruCache;
+import androidx.collection.LruCache;
import android.util.Log;
/**
diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/DownloadModel.java b/core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/DownloadModel.java
index 33e377f2e..1b5749b8d 100644
--- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/DownloadModel.java
+++ b/core/src/model_community/java/com/yizhuan/xchat_android_core/community/download/DownloadModel.java
@@ -1,13 +1,10 @@
package com.yizhuan.xchat_android_core.community.download;
-import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
-import com.liulishuo.okdownload.DownloadListener;
import com.liulishuo.okdownload.DownloadSerialQueue;
import com.liulishuo.okdownload.DownloadTask;
-import com.liulishuo.okdownload.core.breakpoint.BreakpointInfo;
import com.liulishuo.okdownload.core.cause.EndCause;
import com.liulishuo.okdownload.core.cause.ResumeFailedCause;
import com.liulishuo.okdownload.core.listener.DownloadListener1;
@@ -15,12 +12,8 @@ import com.liulishuo.okdownload.core.listener.assist.Listener1Assist;
import com.yizhuan.xchat_android_core.base.BaseModel;
import java.io.File;
-import java.util.List;
-import java.util.Map;
import io.reactivex.Single;
-import io.reactivex.SingleEmitter;
-import io.reactivex.SingleOnSubscribe;
/**
* create by lvzebiao @2019/11/22
diff --git a/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java b/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java
index f9aecb1d3..6c5fe80f4 100644
--- a/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java
+++ b/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java
@@ -1,8 +1,8 @@
package com.yizhuan.tutu.database;
-import android.arch.persistence.room.Database;
-import android.arch.persistence.room.Room;
-import android.arch.persistence.room.RoomDatabase;
+import androidx.room.Database;
+import androidx.room.Room;
+import androidx.room.RoomDatabase;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean;
diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldModel.java b/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldModel.java
index 479fb390c..0868e01a4 100644
--- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldModel.java
+++ b/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldModel.java
@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.miniworld.model;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.google.gson.JsonElement;
import com.yizhuan.xchat_android_core.auth.AuthModel;
@@ -22,7 +22,6 @@ import com.yizhuan.xchat_android_core.miniworld.bean.TopicInfo;
import com.yizhuan.xchat_android_core.monsterhunting.model.MonsterHuntingModel;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
-import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/core/src/model_multi_domain/java/com/yizhuan/xchat_android_core/domain/model/DomainModel.java b/core/src/model_multi_domain/java/com/yizhuan/xchat_android_core/domain/model/DomainModel.java
index 02fb1ca08..826a5f6aa 100644
--- a/core/src/model_multi_domain/java/com/yizhuan/xchat_android_core/domain/model/DomainModel.java
+++ b/core/src/model_multi_domain/java/com/yizhuan/xchat_android_core/domain/model/DomainModel.java
@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_core.domain.model;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.text.TextUtils;
import android.util.Log;
diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java
index d6502e248..6ff647790 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java
+++ b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java
@@ -1,14 +1,9 @@
package com.yizhuan.xchat_android_core.music.db.bean;
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.Index;
-import android.arch.persistence.room.PrimaryKey;
-
-import com.yizhuan.xchat_android_library.utils.BlankUtil;
-import com.yizhuan.xchat_android_library.utils.json.JsonParser;
-
-import java.util.List;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
import lombok.Data;
diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java
index 690c1b07c..62e6a76c9 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java
+++ b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java
@@ -1,9 +1,9 @@
package com.yizhuan.xchat_android_core.music.db.bean;
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.Index;
-import android.arch.persistence.room.PrimaryKey;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
import lombok.Data;
diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java
index 4b202eb99..46220ad96 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java
+++ b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java
@@ -1,10 +1,10 @@
package com.yizhuan.xchat_android_core.music.db.dao;
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Delete;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.OnConflictStrategy;
-import android.arch.persistence.room.Query;
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean;
diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java
index 3c9426717..405303cb9 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java
+++ b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java
@@ -1,10 +1,10 @@
package com.yizhuan.xchat_android_core.music.db.dao;
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Delete;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.OnConflictStrategy;
-import android.arch.persistence.room.Query;
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean;
import com.yizhuan.xchat_android_core.music.db.bean.SongBean;
diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java
index 6a90ade7d..18fcb9291 100644
--- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java
+++ b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
import android.content.Context;
import android.database.Cursor;
import android.provider.MediaStore;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.yizhuan.tutu.database.AppDataBase;
import com.yizhuan.xchat_android_core.base.BaseModel;
diff --git a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentActivity.java b/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentActivity.java
index 02974b7b2..f40ebb502 100644
--- a/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentActivity.java
+++ b/core/src/model_pay/java/com/yizhuan/xchat_android_core/pay/PaymentActivity.java
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.tencent.mm.opensdk.constants.Build;
import com.tencent.mm.opensdk.constants.ConstantsAPI;
diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/PublicChatHallModel.java b/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/PublicChatHallModel.java
index fee309787..143a54afe 100644
--- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/PublicChatHallModel.java
+++ b/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/PublicChatHallModel.java
@@ -1,9 +1,8 @@
package com.yizhuan.xchat_android_core.public_chat_hall.model;
import android.annotation.SuppressLint;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import com.netease.nim.uikit.business.session.event.MessageEvent;
import com.netease.nimlib.sdk.AbortableFuture;
import com.netease.nimlib.sdk.NIMChatRoomSDK;
import com.netease.nimlib.sdk.RequestCallback;
@@ -26,7 +25,6 @@ import com.yizhuan.xchat_android_core.public_chat_hall.bean.PublicChatHallMessag
import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
-import com.yizhuan.xchat_android_core.user.event.CurrentUserInfoCompleteEvent;
import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.net.rxnet.RxNet;
diff --git a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/UpgradeModel.java b/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/UpgradeModel.java
index 59bbec801..86295df33 100644
--- a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/UpgradeModel.java
+++ b/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/UpgradeModel.java
@@ -4,9 +4,9 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.FileProvider;
import android.text.TextUtils;
import android.util.Log;
diff --git a/gradle.properties b/gradle.properties
index 8d9cd71df..45f0195e0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,13 +19,15 @@ org.gradle.daemon=true
android.enableD8=true
android.injected.testOnly=false
-# CI jenkins 参数化构建传入参数
+# CI jenkins \u53C2\u6570\u5316\u6784\u5EFA\u4F20\u5165\u53C2\u6570
version_name=1.0.0
version_code=1
-# jenkins打包参数 可选值 arm x86 arm_x86
+# jenkins\u6253\u5305\u53C2\u6570 \u53EF\u9009\u503C arm x86 arm_x86
ndk_abi_filters=arm
-# jenkins参数，debug下打渠道包用到，
-# 可选值 v1：仅支持v1签名，v1v2：支持v1v2签名
+# jenkins\u53C2\u6570\uFF0Cdebug\u4E0B\u6253\u6E20\u9053\u5305\u7528\u5230\uFF0C
+# \u53EF\u9009\u503C v1\uFF1A\u4EC5\u652F\u6301v1\u7B7E\u540D\uFF0Cv1v2\uFF1A\u652F\u6301v1v2\u7B7E\u540D
sign_mode=v1
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fb3015f87..69ed8a555 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index 9b1d2658e..ad950979b 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -7,7 +7,7 @@ android {
targetSdkVersion 29
versionCode 1
versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@@ -35,7 +35,7 @@ android {
dependencies {
def supportLibraryVersion = "27.1.1"
- def glideVersion = "4.4.0"
+ def glideVersion = "4.11.0"
def retrofitVersion = "2.3.0"
def okhttp3 = "3.12.0"
def okio = "1.16.0"
@@ -44,7 +44,7 @@ dependencies {
def rxjava = "2.1.7"
def rxjava_android = "2.0.1"
def rxlifecycle = "2.1.0"
- def loggerVersion = "2.1.1"
+ def loggerVersion = "2.2.0"
def qiniu = "7.3.15"
def SmartRefreshLayoutVersion = "1.0.3"
def eventbusVersion = "3.0.0"
@@ -52,14 +52,14 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
- androidTestImplementation 'com.android.support.test:runner:1.0.2'
- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+ androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
- implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
- api "com.android.support:appcompat-v7:${supportLibraryVersion}"
- api "com.android.support:recyclerview-v7:${supportLibraryVersion}"
- api "com.android.support:design:${supportLibraryVersion}"
+ api 'androidx.appcompat:appcompat:1.1.0'
+ api 'androidx.recyclerview:recyclerview:1.1.0'
+ api 'com.google.android.material:material:1.1.0'
api "com.squareup.retrofit2:retrofit:${retrofitVersion}"
api "com.squareup.okhttp3:okhttp:${okhttp3}"
diff --git a/library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java b/library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java
index 93eac22bf..c872788b5 100644
--- a/library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java
+++ b/library/src/androidTest/java/com/yizhuan/xchat_android_library/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
package com.yizhuan.xchat_android_library;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java b/library/src/main/java/com/yizhuan/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java
index 594a6ce04..3df7ed175 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/adapters/BaseListRecyclerViewAdapter.java
@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_library.adapters;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpActivity.java b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpActivity.java
index 71fd558e3..dc15ee725 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpActivity.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpActivity.java
@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_library.base;
import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.Log;
import com.yizhuan.xchat_android_library.base.factory.BaseMvpProxy;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpFragment.java b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpFragment.java
index 2e27abf75..cd2160958 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpFragment.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpFragment.java
@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_library.base;
import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.Log;
import com.yizhuan.xchat_android_library.base.factory.BaseMvpProxy;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpPresenter.java b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpPresenter.java
index 502f66816..3a8d94bc1 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpPresenter.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/base/AbstractMvpPresenter.java
@@ -1,8 +1,8 @@
package com.yizhuan.xchat_android_library.base;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import android.util.Log;
import com.trello.rxlifecycle2.LifecycleProvider;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/ItemViewHolder.java b/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/ItemViewHolder.java
index ff0ada03c..267c74d91 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/ItemViewHolder.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/ItemViewHolder.java
@@ -1,8 +1,8 @@
package com.yizhuan.xchat_android_library.bindinglist;
-import android.databinding.DataBindingUtil;
-import android.databinding.ViewDataBinding;
-import android.support.v7.widget.RecyclerView;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.ViewGroup;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/MultiTypeAdapter.java b/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/MultiTypeAdapter.java
index 5885295e6..c2a76b5b4 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/MultiTypeAdapter.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/bindinglist/MultiTypeAdapter.java
@@ -1,11 +1,11 @@
package com.yizhuan.xchat_android_library.bindinglist;
-import android.databinding.ObservableArrayList;
-import android.databinding.ObservableList;
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableList;
import android.os.Looper;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
import android.view.ViewGroup;
import java.lang.ref.WeakReference;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/list/NoScrollingLinearLayoutManager.java b/library/src/main/java/com/yizhuan/xchat_android_library/list/NoScrollingLinearLayoutManager.java
index 1e1e79fad..b5e59911a 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/list/NoScrollingLinearLayoutManager.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/list/NoScrollingLinearLayoutManager.java
@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_library.list;
import android.content.Context;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
import android.util.AttributeSet;
public class NoScrollingLinearLayoutManager extends LinearLayoutManager {
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/manager/TracingManager.java b/library/src/main/java/com/yizhuan/xchat_android_library/manager/TracingManager.java
index 1f59d940f..f343de6c5 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/manager/TracingManager.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/manager/TracingManager.java
@@ -2,7 +2,7 @@ package com.yizhuan.xchat_android_library.manager;
import android.app.Application;
import android.os.Debug;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
/**
*
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java b/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java
index 280ae2186..432ed774f 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/service/ErBanService.java
@@ -3,7 +3,7 @@ package com.yizhuan.xchat_android_library.service;
import android.app.job.JobParameters;
import android.app.job.JobService;
import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
import com.orhanobut.logger.Logger;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackLayout.java b/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackLayout.java
index f45d62d7b..f0a0abe3e 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackLayout.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/SwipeBackLayout.java
@@ -6,7 +6,7 @@ import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/ViewDragHelper.java b/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/ViewDragHelper.java
index 94b6d1d10..bd0bb1237 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/ViewDragHelper.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/swipeactivity/ViewDragHelper.java
@@ -17,10 +17,10 @@
package com.yizhuan.xchat_android_library.swipeactivity;
import android.content.Context;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.VelocityTrackerCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.ScrollerCompat;
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.VelocityTrackerCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.widget.ScrollerCompat;
import android.view.MotionEvent;
import android.view.VelocityTracker;
import android.view.View;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakThreadFactory.java b/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakThreadFactory.java
index f21870a2b..6a42a27f9 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakThreadFactory.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/threadmgr/SpeakThreadFactory.java
@@ -1,6 +1,6 @@
package com.yizhuan.xchat_android_library.threadmgr;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import java.util.concurrent.ThreadFactory;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ScreenUtils.java b/library/src/main/java/com/yizhuan/xchat_android_library/utils/ScreenUtils.java
index ade8a67de..b56e0f46f 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/utils/ScreenUtils.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/utils/ScreenUtils.java
@@ -10,7 +10,7 @@ import android.graphics.Bitmap;
import android.graphics.Point;
import android.os.Build;
import android.provider.Settings;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.util.DisplayMetrics;
import android.view.Surface;
import android.view.View;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/DrawableCenterTextView.java b/library/src/main/java/com/yizhuan/xchat_android_library/widget/DrawableCenterTextView.java
index 0e667abe8..adcf4458e 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/DrawableCenterTextView.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/widget/DrawableCenterTextView.java
@@ -2,7 +2,7 @@ package com.yizhuan.xchat_android_library.widget;
import android.content.Context;
import android.graphics.Canvas;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.AttributeSet;
import com.yizhuan.xchat_android_library.utils.CenterDrawableHelper;
@@ -14,7 +14,7 @@ import com.yizhuan.xchat_android_library.utils.CenterDrawableHelper;
* @author jiahui
* @date 2018/1/11
*/
-public class DrawableCenterTextView extends android.support.v7.widget.AppCompatTextView {
+public class DrawableCenterTextView extends androidx.appcompat.widget.AppCompatTextView {
public DrawableCenterTextView(Context context) {
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/ShapeConstrainLayout.java b/library/src/main/java/com/yizhuan/xchat_android_library/widget/ShapeConstrainLayout.java
index 624ebb5b3..57bb7bfcd 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/ShapeConstrainLayout.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/widget/ShapeConstrainLayout.java
@@ -4,7 +4,7 @@ import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.drawable.GradientDrawable;
-import android.support.constraint.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintLayout;
import android.util.AttributeSet;
import com.yizhuan.xchat_android_library.R;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java b/library/src/main/java/com/yizhuan/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java
index 8971d634e..82c8202b6 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/widget/decoration/RowColumnDifItemDecoration.java
@@ -2,7 +2,7 @@ package com.yizhuan.xchat_android_library.widget.decoration;
import android.content.Context;
import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.TypedValue;
import android.view.View;
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java b/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java
index 797f6d988..bb46796a0 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarDefaultItemDecoration.java
@@ -3,13 +3,13 @@ package com.yizhuan.xchat_android_library.widget.xlist;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.OrientationHelper;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
-import android.util.Log;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+
import android.view.View;
/**
diff --git a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarRecyclerView.java b/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarRecyclerView.java
index f4845bf43..c277b9b7e 100644
--- a/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarRecyclerView.java
+++ b/library/src/main/java/com/yizhuan/xchat_android_library/widget/xlist/FamiliarRecyclerView.java
@@ -3,16 +3,13 @@ package com.yizhuan.xchat_android_library.widget.xlist;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.OrientationHelper;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.util.AttributeSet;
-import android.view.MotionEvent;
import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
import com.yizhuan.xchat_android_library.R;
diff --git a/nim_uikit/build.gradle b/nim_uikit/build.gradle
index 0399d800f..b08e70c4e 100644
--- a/nim_uikit/build.gradle
+++ b/nim_uikit/build.gradle
@@ -39,21 +39,21 @@ android {
}
def overscroll_android = "1.0.4"
-def base_recyclerview_helper = "2.9.34"
+def base_recyclerview_helper = "2.9.46"
def ShortcutBadger = "1.1.17"
def ConstraintLayoutVersion = "1.1.3"
def GlideTransformationsVersion = "3.0.1"
-def NimNetVersion = "6.7.0"
-def glideVersion = "4.4.0"
+def NimNetVersion = "7.4.0"
+def glideVersion = "4.11.0"
dependencies {
api fileTree(include: '*.jar', dir: 'libs')
api "me.everything:overscroll-decor-android:${overscroll_android}"
api "com.github.CymChad:BaseRecyclerViewAdapterHelper:${base_recyclerview_helper}"
api "me.leolin:ShortcutBadger:${ShortcutBadger}@aar"
- api "com.android.support.constraint:constraint-layout:${ConstraintLayoutVersion}"
+ api 'androidx.constraintlayout:constraintlayout:1.1.3'
api "jp.wasabeef:glide-transformations:${GlideTransformationsVersion}"
-
+ annotationProcessor 'androidx.annotation:annotation:1.1.0'
// 基础功能 (必需)
api "com.netease.nimlib:basesdk:${NimNetVersion}"
// 聊天室需要
diff --git a/nim_uikit/res/layout/nim_advanced_team_announce.xml b/nim_uikit/res/layout/nim_advanced_team_announce.xml
index 9de72867f..ccb511fdb 100644
--- a/nim_uikit/res/layout/nim_advanced_team_announce.xml
+++ b/nim_uikit/res/layout/nim_advanced_team_announce.xml
@@ -6,14 +6,14 @@
android:orientation="vertical">
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
-
-
+ app:titleTextAppearance="@style/Toolbar.TitleText">
+
-
-
-
-
+
+
-
-
-
-
-
+
+
-
diff --git a/nim_uikit/res/layout/nim_mass_message_activity.xml b/nim_uikit/res/layout/nim_mass_message_activity.xml
index ceae3f705..04abb2333 100644
--- a/nim_uikit/res/layout/nim_mass_message_activity.xml
+++ b/nim_uikit/res/layout/nim_mass_message_activity.xml
@@ -5,22 +5,22 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
-
-
-
+
+
-
-
-
+
\ No newline at end of file
diff --git a/nim_uikit/res/layout/nim_message_activity_actions_layout.xml b/nim_uikit/res/layout/nim_message_activity_actions_layout.xml
index caae7d875..ac5527f52 100644
--- a/nim_uikit/res/layout/nim_message_activity_actions_layout.xml
+++ b/nim_uikit/res/layout/nim_message_activity_actions_layout.xml
@@ -7,7 +7,7 @@
android:orientation="vertical"
android:visibility="gone" >
-
-
-
-
-
-
+
+
diff --git a/nim_uikit/res/layout/nim_picker_album_activity.xml b/nim_uikit/res/layout/nim_picker_album_activity.xml
index 8fdc45baf..ae37db09d 100644
--- a/nim_uikit/res/layout/nim_picker_album_activity.xml
+++ b/nim_uikit/res/layout/nim_picker_album_activity.xml
@@ -5,22 +5,22 @@
android:layout_height="match_parent"
android:background="@color/white">
-
-
-
-
+
+
-
@@ -60,14 +60,14 @@
android:textSize="14sp" />
-
-
-
-
+
+
\ No newline at end of file
diff --git a/nim_uikit/res/layout/nim_preview_image_from_camera_activity.xml b/nim_uikit/res/layout/nim_preview_image_from_camera_activity.xml
index 1ba8c2be2..923d9b034 100644
--- a/nim_uikit/res/layout/nim_preview_image_from_camera_activity.xml
+++ b/nim_uikit/res/layout/nim_preview_image_from_camera_activity.xml
@@ -6,14 +6,14 @@
android:background="@color/black"
android:orientation="vertical">
-
-
-
-
+
+
-
-
-
-
+ app:titleTextAppearance="@style/Toolbar.TitleText">
+
-
-
-
-
+
+
-
-
-
-
+
+
-
-
+
\ No newline at end of file
diff --git a/nim_uikit/res/layout/nim_team_message_activity.xml b/nim_uikit/res/layout/nim_team_message_activity.xml
index 8e9864f54..930473cef 100644
--- a/nim_uikit/res/layout/nim_team_message_activity.xml
+++ b/nim_uikit/res/layout/nim_team_message_activity.xml
@@ -5,20 +5,20 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
-
-
+
-
-
-
-
+
+
-
-
-
-
+
+
-
diff --git a/nim_uikit/res/layout/nim_watch_picture_activity.xml b/nim_uikit/res/layout/nim_watch_picture_activity.xml
index 5711270f4..6361d0a47 100644
--- a/nim_uikit/res/layout/nim_watch_picture_activity.xml
+++ b/nim_uikit/res/layout/nim_watch_picture_activity.xml
@@ -10,14 +10,14 @@
-
-
-
+
-
+
-
diff --git a/nim_uikit/res/layout/nim_watch_video_activity.xml b/nim_uikit/res/layout/nim_watch_video_activity.xml
index 021342ecd..25aec5271 100644
--- a/nim_uikit/res/layout/nim_watch_video_activity.xml
+++ b/nim_uikit/res/layout/nim_watch_video_activity.xml
@@ -6,14 +6,14 @@
android:background="@color/black"
android:orientation="vertical">
-
-
-
-
+
+
+ app:actionViewClass="androidx.appcompat.widget.SearchView"/>
\ No newline at end of file
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactDecoration.java b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactDecoration.java
index e51982aed..da7531456 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactDecoration.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactDecoration.java
@@ -1,7 +1,7 @@
package com.netease.nim.uikit.business.ait.selector;
import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import com.netease.nim.uikit.common.ui.recyclerview.decoration.DividerItemDecoration;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactSelectorActivity.java b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactSelectorActivity.java
index de3116c23..ff37a5c61 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactSelectorActivity.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/AitContactSelectorActivity.java
@@ -4,8 +4,8 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.netease.nim.uikit.R;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/adapter/AitContactAdapter.java b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/adapter/AitContactAdapter.java
index 5d5f4d580..556b00d0e 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/adapter/AitContactAdapter.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/ait/selector/adapter/AitContactAdapter.java
@@ -1,6 +1,6 @@
package com.netease.nim.uikit.business.ait.selector.adapter;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import com.netease.nim.uikit.R;
import com.netease.nim.uikit.business.ait.selector.holder.RobotViewHolder;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/chatroom/adapter/ChatRoomMsgAdapter.java b/nim_uikit/src/com/netease/nim/uikit/business/chatroom/adapter/ChatRoomMsgAdapter.java
index edb6c0585..0e4284535 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/chatroom/adapter/ChatRoomMsgAdapter.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/chatroom/adapter/ChatRoomMsgAdapter.java
@@ -1,6 +1,6 @@
package com.netease.nim.uikit.business.chatroom.adapter;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.netease.nim.uikit.R;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/chatroom/module/ChatRoomMsgListPanel.java b/nim_uikit/src/com/netease/nim/uikit/business/chatroom/module/ChatRoomMsgListPanel.java
index 4a8abac83..b0185be52 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/chatroom/module/ChatRoomMsgListPanel.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/chatroom/module/ChatRoomMsgListPanel.java
@@ -4,8 +4,8 @@ import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.net.Uri;
import android.os.Handler;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.View;
@@ -16,7 +16,6 @@ import com.netease.nim.uikit.business.chatroom.viewholder.ChatRoomMsgViewHolderB
import com.netease.nim.uikit.business.preference.UserPreferences;
import com.netease.nim.uikit.business.robot.parser.elements.group.LinkElement;
import com.netease.nim.uikit.business.session.audio.MessageAudioControl;
-import com.netease.nim.uikit.business.session.event.MessageEvent;
import com.netease.nim.uikit.business.session.module.Container;
import com.netease.nim.uikit.business.session.viewholder.robot.RobotLinkView;
import com.netease.nim.uikit.common.ui.dialog.EasyAlertDialog;
@@ -45,8 +44,6 @@ import com.netease.nimlib.sdk.robot.model.RobotAttachment;
import com.netease.nimlib.sdk.robot.model.RobotMsgType;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import org.greenrobot.eventbus.EventBus;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/contact/selector/activity/ContactSelectActivity.java b/nim_uikit/src/com/netease/nim/uikit/business/contact/selector/activity/ContactSelectActivity.java
index aabe8cbd7..194ee4264 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/contact/selector/activity/ContactSelectActivity.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/contact/selector/activity/ContactSelectActivity.java
@@ -5,8 +5,8 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.widget.SearchView;
+import androidx.core.view.MenuItemCompat;
+import androidx.appcompat.widget.SearchView;
import android.text.TextUtils;
import android.util.TypedValue;
import android.view.MenuItem;
@@ -21,7 +21,6 @@ import android.widget.ImageView;
import android.widget.ListView;
import android.widget.RelativeLayout;
import android.widget.TextView;
-import android.widget.Toast;
import com.netease.nim.uikit.R;
import com.netease.nim.uikit.api.wrapper.NimToolBarOptions;
@@ -55,7 +54,7 @@ import java.util.List;
*
* Created by huangjun on 2015/3/3.
*/
-public class ContactSelectActivity extends UI implements View.OnClickListener, android.support.v7.widget.SearchView.OnQueryTextListener {
+public class ContactSelectActivity extends UI implements View.OnClickListener, androidx.appcompat.widget.SearchView.OnQueryTextListener {
public static final String EXTRA_DATA = "EXTRA_DATA"; // 请求数据：Option
public static final String RESULT_DATA = "RESULT_DATA"; // 返回结果
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/recent/RecentContactsFragment.java b/nim_uikit/src/com/netease/nim/uikit/business/recent/RecentContactsFragment.java
index 8b5acc9b0..9f6fb26bb 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/recent/RecentContactsFragment.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/recent/RecentContactsFragment.java
@@ -1,14 +1,13 @@
package com.netease.nim.uikit.business.recent;
import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
-import android.widget.Toast;
import com.netease.nim.uikit.R;
import com.netease.nim.uikit.api.NimUIKit;
@@ -28,7 +27,6 @@ import com.netease.nim.uikit.common.ui.recyclerview.listener.SimpleClickListener
import com.netease.nim.uikit.impl.NimUIKitImpl;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.Observer;
-import com.netease.nimlib.sdk.RequestCallback;
import com.netease.nimlib.sdk.RequestCallbackWrapper;
import com.netease.nimlib.sdk.ResponseCode;
import com.netease.nimlib.sdk.msg.MsgService;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/recent/adapter/RecentContactAdapter.java b/nim_uikit/src/com/netease/nim/uikit/business/recent/adapter/RecentContactAdapter.java
index 619cf8906..61a7f45da 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/recent/adapter/RecentContactAdapter.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/recent/adapter/RecentContactAdapter.java
@@ -1,6 +1,6 @@
package com.netease.nim.uikit.business.recent.adapter;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import com.netease.nim.uikit.R;
import com.netease.nim.uikit.business.recent.RecentContactsCallback;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/BaseMessageActivity.java b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/BaseMessageActivity.java
index ba1fa92e4..0754b709c 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/BaseMessageActivity.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/BaseMessageActivity.java
@@ -2,7 +2,7 @@ package com.netease.nim.uikit.business.session.activity;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchMessagePictureActivity.java b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchMessagePictureActivity.java
index 8fdea3612..78ee98444 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchMessagePictureActivity.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchMessagePictureActivity.java
@@ -8,9 +8,9 @@ import android.graphics.Color;
import android.os.Bundle;
import android.os.Handler;
import android.provider.MediaStore;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.core.view.ViewCompat;
+import androidx.viewpager.widget.ViewPager;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
@@ -18,7 +18,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
-import android.widget.Toast;
import com.bumptech.glide.Glide;
import com.netease.nim.uikit.R;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchPicAndVideoMenuActivity.java b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchPicAndVideoMenuActivity.java
index e35bd9e79..1c28d1e26 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchPicAndVideoMenuActivity.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchPicAndVideoMenuActivity.java
@@ -3,8 +3,8 @@ package com.netease.nim.uikit.business.session.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import com.netease.nim.uikit.R;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchVideoActivity.java b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchVideoActivity.java
index f2ae14500..ef3f378ab 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchVideoActivity.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/activity/WatchVideoActivity.java
@@ -10,7 +10,7 @@ import android.media.MediaPlayer.OnPreparedListener;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
-import android.support.v7.app.ActionBar;
+import androidx.appcompat.app.ActionBar;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.view.SurfaceHolder;
@@ -22,7 +22,6 @@ import android.view.ViewGroup.LayoutParams;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
-import android.widget.Toast;
import com.netease.nim.uikit.R;
import com.netease.nim.uikit.api.wrapper.NimToolBarOptions;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/adapter/MediaAdapter.java b/nim_uikit/src/com/netease/nim/uikit/business/session/adapter/MediaAdapter.java
index 72f12d598..4d35433aa 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/adapter/MediaAdapter.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/adapter/MediaAdapter.java
@@ -1,7 +1,7 @@
package com.netease.nim.uikit.business.session.adapter;
import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmojiManager.java b/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmojiManager.java
index 9807f3127..160a90325 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmojiManager.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmojiManager.java
@@ -8,7 +8,7 @@ import android.graphics.BitmapFactory.Options;
import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
-import android.support.v4.util.LruCache;
+import androidx.collection.LruCache;
import android.util.DisplayMetrics;
import android.util.Xml;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonPickerView.java b/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonPickerView.java
index 3c9100c3f..d7c9d857a 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonPickerView.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonPickerView.java
@@ -5,7 +5,7 @@ import android.content.Context;
import android.graphics.Bitmap;
import android.os.Build;
import android.os.Handler;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonView.java b/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonView.java
index 9ddf44471..3d514a01b 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonView.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/emoji/EmoticonView.java
@@ -1,9 +1,9 @@
package com.netease.nim.uikit.business.session.emoji;
import android.content.Context;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/helper/MsgBkImageView.java b/nim_uikit/src/com/netease/nim/uikit/business/session/helper/MsgBkImageView.java
index 24ba21416..1095aca8e 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/helper/MsgBkImageView.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/helper/MsgBkImageView.java
@@ -3,7 +3,7 @@ package com.netease.nim.uikit.business.session.helper;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
import android.util.AttributeSet;
public class MsgBkImageView extends AppCompatImageView {
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPagerAdapter.java b/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPagerAdapter.java
index c0207fbfc..e4ce766a1 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPagerAdapter.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPagerAdapter.java
@@ -2,8 +2,8 @@ package com.netease.nim.uikit.business.session.module.input;
import android.content.Context;
import android.content.res.Resources;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPanel.java b/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPanel.java
index 8b33f357a..44fcd5504 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPanel.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/module/input/ActionsPanel.java
@@ -1,6 +1,6 @@
package com.netease.nim.uikit.business.session.module.input;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/IncomingMsgPrompt.java b/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/IncomingMsgPrompt.java
index 5d052ee47..1befc9f91 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/IncomingMsgPrompt.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/IncomingMsgPrompt.java
@@ -2,7 +2,7 @@ package com.netease.nim.uikit.business.session.module.list;
import android.content.Context;
import android.os.Handler;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.text.style.ImageSpan;
import android.view.View;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MessageListPanelEx.java b/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MessageListPanelEx.java
index eae8d3c48..75c952950 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MessageListPanelEx.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MessageListPanelEx.java
@@ -6,8 +6,8 @@ import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Handler;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Pair;
import android.view.View;
@@ -21,7 +21,6 @@ import com.netease.nim.uikit.business.preference.UserPreferences;
import com.netease.nim.uikit.business.robot.parser.elements.group.LinkElement;
import com.netease.nim.uikit.business.session.activity.VoiceTrans;
import com.netease.nim.uikit.business.session.audio.MessageAudioControl;
-import com.netease.nim.uikit.business.session.event.MessageEvent;
import com.netease.nim.uikit.business.session.helper.MessageHelper;
import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper;
import com.netease.nim.uikit.business.session.module.Container;
@@ -62,8 +61,6 @@ import com.netease.nimlib.sdk.team.constant.TeamMemberType;
import com.netease.nimlib.sdk.team.model.TeamMember;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
-import org.greenrobot.eventbus.EventBus;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MsgAdapter.java b/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MsgAdapter.java
index 6ffd3e937..2fc57be48 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MsgAdapter.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/module/list/MsgAdapter.java
@@ -1,6 +1,6 @@
package com.netease.nim.uikit.business.session.module.list;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.netease.nim.uikit.R;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/DateViewHolder.java b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/DateViewHolder.java
index 535f94f9d..66a6cdf99 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/DateViewHolder.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/DateViewHolder.java
@@ -1,6 +1,6 @@
package com.netease.nim.uikit.business.session.viewholder.media;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.TextView;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/MediaViewHolder.java b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/MediaViewHolder.java
index 82b0146ae..b64159bd2 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/MediaViewHolder.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/media/MediaViewHolder.java
@@ -1,6 +1,6 @@
package com.netease.nim.uikit.business.session.viewholder.media;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.ImageView;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotContentLinearLayout.java b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotContentLinearLayout.java
index 3613d77e8..397a8c997 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotContentLinearLayout.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotContentLinearLayout.java
@@ -1,7 +1,7 @@
package com.netease.nim.uikit.business.session.viewholder.robot;
import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.view.ViewGroup;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotViewBase.java b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotViewBase.java
index 3463b5e7d..654d27a9c 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotViewBase.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/viewholder/robot/RobotViewBase.java
@@ -1,7 +1,7 @@
package com.netease.nim.uikit.business.session.viewholder.robot;
import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.widget.FrameLayout;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/session/widget/NimEmojiTextView.java b/nim_uikit/src/com/netease/nim/uikit/business/session/widget/NimEmojiTextView.java
index d25896531..7edef4126 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/session/widget/NimEmojiTextView.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/session/widget/NimEmojiTextView.java
@@ -1,7 +1,7 @@
package com.netease.nim.uikit.business.session.widget;
import android.content.Context;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.appcompat.widget.AppCompatTextView;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.AttributeSet;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/team/adapter/TeamMemberListAdapter.java b/nim_uikit/src/com/netease/nim/uikit/business/team/adapter/TeamMemberListAdapter.java
index 788d2c205..62e953ee3 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/team/adapter/TeamMemberListAdapter.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/team/adapter/TeamMemberListAdapter.java
@@ -1,7 +1,7 @@
package com.netease.nim.uikit.business.team.adapter;
import android.content.Context;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/nim_uikit/src/com/netease/nim/uikit/business/team/viewholder/TeamMemberListHolder.java b/nim_uikit/src/com/netease/nim/uikit/business/team/viewholder/TeamMemberListHolder.java
index e9a6de6e7..73f123ac0 100644
--- a/nim_uikit/src/com/netease/nim/uikit/business/team/viewholder/TeamMemberListHolder.java
+++ b/nim_uikit/src/com/netease/nim/uikit/business/team/viewholder/TeamMemberListHolder.java
@@ -1,6 +1,6 @@
package com.netease.nim.uikit.business.team.viewholder;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.TextView;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/activity/ListActivityBase.java b/nim_uikit/src/com/netease/nim/uikit/common/activity/ListActivityBase.java
index e7e1c56d4..4a67f3c38 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/activity/ListActivityBase.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/activity/ListActivityBase.java
@@ -1,8 +1,8 @@
package com.netease.nim.uikit.common.activity;
import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import com.netease.nim.uikit.R;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/activity/UI.java b/nim_uikit/src/com/netease/nim/uikit/common/activity/UI.java
index 030b645d7..e7524557c 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/activity/UI.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/activity/UI.java
@@ -3,22 +3,16 @@ package com.netease.nim.uikit.common.activity;
import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
-import android.os.Bundle;
import android.os.Handler;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.widget.Toolbar;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.widget.Toolbar;
import android.text.TextUtils;
import android.view.KeyEvent;
-import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
-import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
-import android.widget.FrameLayout;
-import com.netease.nim.uikit.R;
-import com.netease.nim.uikit.StatusBarUtil;
import com.netease.nim.uikit.common.fragment.TFragment;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.netease.nim.uikit.common.util.sys.ReflectionUtil;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/adapter/TViewHolder.java b/nim_uikit/src/com/netease/nim/uikit/common/adapter/TViewHolder.java
index 048be3a80..26ad200be 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/adapter/TViewHolder.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/adapter/TViewHolder.java
@@ -1,7 +1,7 @@
package com.netease.nim.uikit.common.adapter;
import android.content.Context;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/fragment/TFragment.java b/nim_uikit/src/com/netease/nim/uikit/common/fragment/TFragment.java
index 6b00c3913..0bae10719 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/fragment/TFragment.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/fragment/TFragment.java
@@ -4,7 +4,7 @@ import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PickerAlbumPreviewActivity.java b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PickerAlbumPreviewActivity.java
index 55e2c8b03..4099c5079 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PickerAlbumPreviewActivity.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PickerAlbumPreviewActivity.java
@@ -5,15 +5,14 @@ import android.content.Intent;
import android.graphics.Bitmap;
import android.os.Bundle;
import android.os.Handler;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
+
+import androidx.viewpager.widget.ViewPager;
+import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.TextView;
-import android.widget.Toast;
import com.netease.nim.uikit.R;
import com.netease.nim.uikit.api.wrapper.NimToolBarOptions;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PreviewImageFromLocalActivity.java b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PreviewImageFromLocalActivity.java
index 459f2391c..8f6c46f47 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PreviewImageFromLocalActivity.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/activity/PreviewImageFromLocalActivity.java
@@ -7,15 +7,14 @@ import android.graphics.Bitmap;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
-import android.support.v4.view.ViewPager;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
+import androidx.viewpager.widget.ViewPager;
+import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
import android.text.TextUtils;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.TextView;
-import android.widget.Toast;
import com.netease.nim.uikit.R;
import com.netease.nim.uikit.business.session.constant.Extras;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/ImagePagerAdapterInImageSwitch.java b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/ImagePagerAdapterInImageSwitch.java
index 4e5b821a9..8945035b8 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/ImagePagerAdapterInImageSwitch.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/ImagePagerAdapterInImageSwitch.java
@@ -2,7 +2,7 @@ package com.netease.nim.uikit.common.media.picker.adapter;
import android.content.Context;
import android.os.Build;
-import android.support.v4.view.PagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/PickerPreviewPagerAdapter.java b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/PickerPreviewPagerAdapter.java
index 3737e253e..d0d8c2c2c 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/PickerPreviewPagerAdapter.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/adapter/PickerPreviewPagerAdapter.java
@@ -2,7 +2,7 @@ package com.netease.nim.uikit.common.media.picker.adapter;
import android.content.Context;
import android.os.Build;
-import android.support.v4.view.PagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/loader/RotateTransformation.java b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/loader/RotateTransformation.java
index 106b29721..80f8e34e8 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/loader/RotateTransformation.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/loader/RotateTransformation.java
@@ -17,7 +17,6 @@ class RotateTransformation extends BitmapTransformation {
private String path;
RotateTransformation(Context context, String path) {
- super(context);
this.path = path;
}
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/model/GenericFileProvider.java b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/model/GenericFileProvider.java
index 8b36e4959..2df8f3546 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/media/picker/model/GenericFileProvider.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/media/picker/model/GenericFileProvider.java
@@ -1,6 +1,6 @@
package com.netease.nim.uikit.common.media.picker.model;
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
/**
* Created by winnie on 2017/7/26.
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleMessageTouchListener.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleMessageTouchListener.java
index b46c98e12..bbd787793 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleMessageTouchListener.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleMessageTouchListener.java
@@ -5,9 +5,9 @@ import android.graphics.Bitmap;
import android.graphics.PixelFormat;
import android.graphics.PointF;
import android.graphics.drawable.AnimationDrawable;
-import android.support.v4.view.NestedScrollingParent;
-import android.support.v4.widget.NestedScrollView;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.view.NestedScrollingParent;
+import androidx.core.widget.NestedScrollView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java
index 1df4d883d..bd7a8f451 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/BubbleView.java
@@ -4,12 +4,11 @@ import android.content.Context;
import android.graphics.Color;
import android.graphics.Rect;
import android.graphics.drawable.GradientDrawable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.widget.TextViewCompat;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.core.content.ContextCompat;
+import androidx.core.widget.TextViewCompat;
+import androidx.appcompat.widget.AppCompatTextView;
import android.text.TextUtils;
import android.util.AttributeSet;
-import android.util.TypedValue;
import android.view.Gravity;
import android.view.ViewGroup;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/MessageBubbleView.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/MessageBubbleView.java
index d8b61223e..d8b95f958 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/MessageBubbleView.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/draggablebubbles/MessageBubbleView.java
@@ -11,7 +11,7 @@ import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.PointF;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.View;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/drop/DropFake.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/drop/DropFake.java
index 4667f6c0e..60fcd1609 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/drop/DropFake.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/drop/DropFake.java
@@ -2,7 +2,7 @@ package com.netease.nim.uikit.common.ui.drop;
import android.content.Context;
import android.graphics.Canvas;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.MotionEvent;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/imageview/BaseZoomableImageView.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/imageview/BaseZoomableImageView.java
index 7d72ffe2b..f359fd2fc 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/imageview/BaseZoomableImageView.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/imageview/BaseZoomableImageView.java
@@ -33,7 +33,7 @@ import android.graphics.Paint;
import android.graphics.Rect;
import android.os.Build;
import android.os.SystemClock;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/ptr2/SuperSwipeRefreshLayout.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/ptr2/SuperSwipeRefreshLayout.java
index b5a171de4..b32e018dd 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/ptr2/SuperSwipeRefreshLayout.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/ptr2/SuperSwipeRefreshLayout.java
@@ -13,12 +13,12 @@ import android.graphics.Paint;
import android.graphics.RectF;
import android.os.Build;
import android.os.Handler;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.LayoutManager;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.LayoutManager;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.util.Log;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseFetchLoadAdapter.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseFetchLoadAdapter.java
index 8d6f3b5bc..4bdad3a84 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseFetchLoadAdapter.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseFetchLoadAdapter.java
@@ -2,12 +2,12 @@ package com.netease.nim.uikit.common.ui.recyclerview.adapter;
import android.animation.Animator;
import android.content.Context;
-import android.support.annotation.IntDef;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.LayoutParams;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.annotation.IntDef;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.LayoutParams;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseItemDraggableAdapter.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseItemDraggableAdapter.java
index f543a4043..da0c75645 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseItemDraggableAdapter.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseItemDraggableAdapter.java
@@ -1,10 +1,10 @@
package com.netease.nim.uikit.common.ui.recyclerview.adapter;
import android.graphics.Canvas;
-import android.support.annotation.NonNull;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.annotation.NonNull;
+import androidx.core.view.MotionEventCompat;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
import android.view.MotionEvent;
import android.view.View;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemFetchLoadAdapter.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemFetchLoadAdapter.java
index b58f4e33e..d961996ab 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemFetchLoadAdapter.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemFetchLoadAdapter.java
@@ -1,7 +1,7 @@
package com.netease.nim.uikit.common.ui.recyclerview.adapter;
-import android.support.annotation.LayoutRes;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.LayoutRes;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.SparseArray;
import android.view.ViewGroup;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemQuickAdapter.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemQuickAdapter.java
index 3d97ebd20..949dce159 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemQuickAdapter.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseMultiItemQuickAdapter.java
@@ -1,7 +1,7 @@
package com.netease.nim.uikit.common.ui.recyclerview.adapter;
-import android.support.annotation.LayoutRes;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.LayoutRes;
+import androidx.recyclerview.widget.RecyclerView;
import android.util.SparseArray;
import android.view.ViewGroup;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseQuickAdapter.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseQuickAdapter.java
index aece9f822..42fe6e09e 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseQuickAdapter.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseQuickAdapter.java
@@ -17,13 +17,13 @@ package com.netease.nim.uikit.common.ui.recyclerview.adapter;
import android.animation.Animator;
import android.content.Context;
-import android.support.annotation.IntDef;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.LayoutParams;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.annotation.IntDef;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.LayoutParams;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseSectionQuickAdapter.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseSectionQuickAdapter.java
index 12c3024ba..9724461ca 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseSectionQuickAdapter.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/adapter/BaseSectionQuickAdapter.java
@@ -1,6 +1,6 @@
package com.netease.nim.uikit.common.ui.recyclerview.adapter;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.ViewGroup;
import com.netease.nim.uikit.common.ui.recyclerview.entity.SectionEntity;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/callback/ItemDragAndSwipeCallback.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/callback/ItemDragAndSwipeCallback.java
index e6c3236ed..8bbb1af6d 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/callback/ItemDragAndSwipeCallback.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/callback/ItemDragAndSwipeCallback.java
@@ -1,8 +1,8 @@
package com.netease.nim.uikit.common.ui.recyclerview.callback;
import android.graphics.Canvas;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
import android.view.View;
import com.netease.nim.uikit.R;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/DividerItemDecoration.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/DividerItemDecoration.java
index 20fb0f314..de0370800 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/DividerItemDecoration.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/DividerItemDecoration.java
@@ -5,8 +5,8 @@ import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
/**
@@ -64,7 +64,7 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration {
continue;
}
final View child = parent.getChildAt(i);
- android.support.v7.widget.RecyclerView v = new android.support.v7.widget.RecyclerView(parent.getContext());
+ RecyclerView v = new RecyclerView(parent.getContext());
final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
.getLayoutParams();
final int top = child.getBottom() + params.bottomMargin;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/SpacingDecoration.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/SpacingDecoration.java
index 1ab6a8f33..c00a6d4a9 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/SpacingDecoration.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/decoration/SpacingDecoration.java
@@ -1,10 +1,10 @@
package com.netease.nim.uikit.common.ui.recyclerview.decoration;
import android.graphics.Rect;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.view.View;
/**
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/BaseViewHolder.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/BaseViewHolder.java
index 07fa8bd1e..ba3728b06 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/BaseViewHolder.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/BaseViewHolder.java
@@ -21,9 +21,9 @@ import android.graphics.Paint;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.StringRes;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+import androidx.recyclerview.widget.RecyclerView;
import android.text.util.Linkify;
import android.util.SparseArray;
import android.view.View;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/RecyclerViewHolder.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/RecyclerViewHolder.java
index 74c7722b3..8a3179aef 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/RecyclerViewHolder.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/holder/RecyclerViewHolder.java
@@ -1,6 +1,6 @@
package com.netease.nim.uikit.common.ui.recyclerview.holder;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
/**
* Created by huangjun on 2016/12/11.
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemDragListener.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemDragListener.java
index 239f1a86c..a5c6c5df3 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemDragListener.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemDragListener.java
@@ -1,6 +1,6 @@
package com.netease.nim.uikit.common.ui.recyclerview.listener;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
public interface OnItemDragListener {
void onItemDragStart(RecyclerView.ViewHolder viewHolder, int pos);
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemSwipeListener.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemSwipeListener.java
index d857a3ec0..31d5d2351 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemSwipeListener.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/OnItemSwipeListener.java
@@ -1,7 +1,7 @@
package com.netease.nim.uikit.common.ui.recyclerview.listener;
import android.graphics.Canvas;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
public interface OnItemSwipeListener {
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/SimpleClickListener.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/SimpleClickListener.java
index 4fae7c6e0..eb2a97657 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/SimpleClickListener.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/listener/SimpleClickListener.java
@@ -1,8 +1,8 @@
package com.netease.nim.uikit.common.ui.recyclerview.listener;
import android.os.Build;
-import android.support.v4.view.GestureDetectorCompat;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.recyclerview.widget.RecyclerView;
import android.view.GestureDetector;
import android.view.HapticFeedbackConstants;
import android.view.MotionEvent;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/loadmore/LoadMoreView.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/loadmore/LoadMoreView.java
index 7a0819a31..6ea2a9e34 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/loadmore/LoadMoreView.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/loadmore/LoadMoreView.java
@@ -1,7 +1,7 @@
package com.netease.nim.uikit.common.ui.recyclerview.loadmore;
-import android.support.annotation.IdRes;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseQuickAdapter;
import com.netease.nim.uikit.common.ui.recyclerview.holder.BaseViewHolder;
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/util/RecyclerViewUtil.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/util/RecyclerViewUtil.java
index 8cfa53804..9ef6a00a2 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/util/RecyclerViewUtil.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/recyclerview/util/RecyclerViewUtil.java
@@ -1,7 +1,7 @@
package com.netease.nim.uikit.common.ui.recyclerview.util;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SimpleItemAnimator;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
/**
* Created by hzxuwen on 2017/1/13.
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/span/RadiusBackgroundSpan.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/span/RadiusBackgroundSpan.java
index a6cac2f26..f9a4be38a 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/span/RadiusBackgroundSpan.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/span/RadiusBackgroundSpan.java
@@ -2,10 +2,9 @@ package com.netease.nim.uikit.common.ui.span;
import android.graphics.Canvas;
import android.graphics.Paint;
-import android.graphics.Rect;
import android.graphics.RectF;
-import android.support.annotation.NonNull;
-import android.text.TextPaint;
+import androidx.annotation.NonNull;
+
import android.text.style.ReplacementSpan;
public class RadiusBackgroundSpan extends ReplacementSpan {
diff --git a/nim_uikit/src/com/netease/nim/uikit/common/ui/widget/ClearableEditTextWithIcon.java b/nim_uikit/src/com/netease/nim/uikit/common/ui/widget/ClearableEditTextWithIcon.java
index c8d501b09..5973b4a2c 100644
--- a/nim_uikit/src/com/netease/nim/uikit/common/ui/widget/ClearableEditTextWithIcon.java
+++ b/nim_uikit/src/com/netease/nim/uikit/common/ui/widget/ClearableEditTextWithIcon.java
@@ -2,7 +2,7 @@ package com.netease.nim.uikit.common.ui.widget;
import android.content.Context;
import android.graphics.drawable.Drawable;
-import android.support.v7.widget.AppCompatEditText;
+import androidx.appcompat.widget.AppCompatEditText;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.AttributeSet;
diff --git a/nim_uikit/src/com/netease/nim/uikit/support/glide/NIMGlideModule.java b/nim_uikit/src/com/netease/nim/uikit/support/glide/NIMGlideModule.java
index 4df96be19..31e3bac40 100644
--- a/nim_uikit/src/com/netease/nim/uikit/support/glide/NIMGlideModule.java
+++ b/nim_uikit/src/com/netease/nim/uikit/support/glide/NIMGlideModule.java
@@ -1,7 +1,7 @@
package com.netease.nim.uikit.support.glide;
import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import com.bumptech.glide.Glide;
import com.bumptech.glide.GlideBuilder;
@@ -11,12 +11,10 @@ import com.bumptech.glide.load.engine.cache.ExternalPreferredCacheDiskCacheFacto
import com.bumptech.glide.manager.ConnectivityMonitor;
import com.bumptech.glide.manager.ConnectivityMonitorFactory;
import com.bumptech.glide.module.AppGlideModule;
-import com.bumptech.glide.util.Synthetic;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.netease.nim.uikit.common.util.sys.NetworkUtil;
import java.io.File;
-import java.util.HashMap;
/**
* Created by huangjun
diff --git a/nim_uikit/src/com/netease/nim/uikit/support/permission/BaseMPermission.java b/nim_uikit/src/com/netease/nim/uikit/support/permission/BaseMPermission.java
index 80f95b2b7..93fb45433 100644
--- a/nim_uikit/src/com/netease/nim/uikit/support/permission/BaseMPermission.java
+++ b/nim_uikit/src/com/netease/nim/uikit/support/permission/BaseMPermission.java
@@ -4,7 +4,7 @@ import android.annotation.TargetApi;
import android.app.Activity;
import android.content.pm.PackageManager;
import android.os.Build;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
import android.util.Log;
import java.util.ArrayList;
diff --git a/nim_uikit/src/com/netease/nim/uikit/support/permission/MPermission.java b/nim_uikit/src/com/netease/nim/uikit/support/permission/MPermission.java
index e89d6262f..c821fbf3e 100644
--- a/nim_uikit/src/com/netease/nim/uikit/support/permission/MPermission.java
+++ b/nim_uikit/src/com/netease/nim/uikit/support/permission/MPermission.java
@@ -4,8 +4,8 @@ import android.annotation.TargetApi;
import android.app.Activity;
import android.content.pm.PackageManager;
import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
import com.netease.nim.uikit.support.permission.annotation.OnMPermissionDenied;
import com.netease.nim.uikit.support.permission.annotation.OnMPermissionGranted;