diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9a51d79..6b00a05 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -20,7 +20,7 @@
     <option name="priority" value="Medium" />
     <option name="excludeFilter" value="" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index bcff911..fa8461b 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -5,6 +5,7 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/HouseProperty.iml" filepath="$PROJECT_DIR$/.idea/modules/HouseProperty.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/HouseProperty.app.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.iml" filepath="$PROJECT_DIR$/.idea/modules/ninegridview/HouseProperty.ninegridview.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/picture_library/HouseProperty.picture_library.iml" filepath="$PROJECT_DIR$/.idea/modules/picture_library/HouseProperty.picture_library.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index a3f1be3..79da48f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,8 +25,8 @@ android {
         enabled = true
     }
 
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 31
+    buildToolsVersion '29.0.2'
     aaptOptions.cruncherEnabled = false
     aaptOptions.useNewCruncher = false
     defaultConfig {
@@ -35,11 +35,11 @@ android {
 //        multiDexEnabled true
         applicationId "com.sl.HouseProperty"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
 //        multiDexEnabled true
         versionCode 1
         versionName "1.1.1"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
 
             //选择要添加的对应cpu类型的.so库。
@@ -118,7 +118,6 @@ android {
         implementation 'com.truizlop.sectionedrecyclerview:library:1.0.0'
         implementation 'tech.wangjie:qrcodetools:1.0.0'
 
-        implementation 'com.android.support:recyclerview-v7:28.0.0'
         implementation 'com.squareup.okhttp3:logging-interceptor:3.4.1'
         implementation 'com.google.zxing:core:3.3.0'
 
@@ -127,10 +126,10 @@ android {
 //        implementation(name: 'viewpicker-release', ext: 'aar')
         implementation(name: 'selectpicker-release', ext: 'aar')
         implementation 'com.github.rey5137:material:1.2.5'
-        implementation 'com.github.bumptech.glide:glide:4.5.0'
+        implementation 'com.github.bumptech.glide:glide:4.9.0'
         implementation 'com.github.chrisbanes:PhotoView:2.0.0'
 
-        implementation 'com.android.support:design:28.0.0'
+
 
         implementation 'net.dankito.richtexteditor:richtexteditor-android:2.0.8'
         implementation(name: 'alipaySdk-15.5.9', ext: 'aar')
@@ -138,7 +137,7 @@ android {
         implementation project(':ninegridview')
         implementation 'com.lxj:xpopup:1.8.10'
         // 添加下面这句即可
-        implementation 'com.android.support:support-v4:28.0.0'
+
         implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'  //1.0.5及以前版本的老用户升级需谨慎，API改动过大
         // 基础依赖包，必须要依赖
         implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
@@ -159,7 +158,15 @@ android {
         implementation 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.5@aar'
         api 'io.reactivex.rxjava2:rxjava:2.1.5'
         implementation 'me.jessyan:autosize:1.1.2'
+
+        implementation 'androidx.camera:camera-view:1.0.0-alpha30'
+    // implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc05'//视频图片选择器
+       implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc10'
     }
 
 }
 
+dependencies {
+  //  implementation project(path: ':picture_library')
+}
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 380501d..b5191af 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -108,7 +108,7 @@
                 android:resource="@xml/provider_paths" />
         </provider>
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="PhotoPicker"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/app/src/main/java/adapter/BaseRecycleViewAdapter.java b/app/src/main/java/adapter/BaseRecycleViewAdapter.java
index d7798d2..ce4d741 100644
--- a/app/src/main/java/adapter/BaseRecycleViewAdapter.java
+++ b/app/src/main/java/adapter/BaseRecycleViewAdapter.java
@@ -5,10 +5,10 @@ package adapter;
  */
 
 import android.content.Context;
-import android.databinding.DataBindingUtil;
-import android.databinding.ViewDataBinding;
-import android.support.annotation.LayoutRes;
-import android.support.v7.widget.RecyclerView;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
+import androidx.annotation.LayoutRes;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,8 +16,6 @@ import android.widget.AdapterView;
 
 import java.util.ArrayList;
 
-import entity.DiscoveryListEntity;
-
 
 public class BaseRecycleViewAdapter<T1, T2 extends ViewDataBinding> extends RecyclerView.Adapter<BaseRecycleViewAdapter.BaseViewHolder> {
     private ArrayList<T1> list=new ArrayList<>();
diff --git a/app/src/main/java/adapter/NoDataRecycleViewAdapter.java b/app/src/main/java/adapter/NoDataRecycleViewAdapter.java
index 2f39afe..723cacb 100644
--- a/app/src/main/java/adapter/NoDataRecycleViewAdapter.java
+++ b/app/src/main/java/adapter/NoDataRecycleViewAdapter.java
@@ -5,15 +5,14 @@ package adapter;
  */
 
 import android.content.Context;
-import android.databinding.DataBindingUtil;
-import android.databinding.ViewDataBinding;
-import android.support.annotation.LayoutRes;
-import android.support.v7.widget.RecyclerView;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
+import androidx.annotation.LayoutRes;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.TextView;
 
 import com.sl.house_property.R;
 
diff --git a/app/src/main/java/adapter/StartViewpagerAdapter.java b/app/src/main/java/adapter/StartViewpagerAdapter.java
index 945c4d7..ba489d8 100644
--- a/app/src/main/java/adapter/StartViewpagerAdapter.java
+++ b/app/src/main/java/adapter/StartViewpagerAdapter.java
@@ -1,7 +1,7 @@
 package adapter;
 
-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.View;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/sl/house_property/BaseActivity.java b/app/src/main/java/com/sl/house_property/BaseActivity.java
index 57d6ae7..f00890d 100644
--- a/app/src/main/java/com/sl/house_property/BaseActivity.java
+++ b/app/src/main/java/com/sl/house_property/BaseActivity.java
@@ -7,18 +7,18 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-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.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/sl/house_property/BaseFragment.java b/app/src/main/java/com/sl/house_property/BaseFragment.java
index 5bb856d..bb62d6e 100644
--- a/app/src/main/java/com/sl/house_property/BaseFragment.java
+++ b/app/src/main/java/com/sl/house_property/BaseFragment.java
@@ -1,17 +1,16 @@
 package com.sl.house_property;
 
 import android.app.ProgressDialog;
-import android.content.Context;
-import android.databinding.DataBindingUtil;
-import android.databinding.ViewDataBinding;
+
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
 import android.os.Bundle;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
 
 /**
  * Created by ximsfei on 17-1-7.
diff --git a/app/src/main/java/com/sl/house_property/BindHouseDialog.java b/app/src/main/java/com/sl/house_property/BindHouseDialog.java
index 1d88e65..a8c8aeb 100644
--- a/app/src/main/java/com/sl/house_property/BindHouseDialog.java
+++ b/app/src/main/java/com/sl/house_property/BindHouseDialog.java
@@ -2,7 +2,7 @@ package com.sl.house_property;
 
 import android.app.ProgressDialog;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
diff --git a/app/src/main/java/com/sl/house_property/CodeActivity.java b/app/src/main/java/com/sl/house_property/CodeActivity.java
index 1044a9f..626b15d 100644
--- a/app/src/main/java/com/sl/house_property/CodeActivity.java
+++ b/app/src/main/java/com/sl/house_property/CodeActivity.java
@@ -4,7 +4,7 @@ import android.app.ProgressDialog;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.Gravity;
 import android.view.View;
 
diff --git a/app/src/main/java/com/sl/house_property/ImagePickerProvider.java b/app/src/main/java/com/sl/house_property/ImagePickerProvider.java
index 2845b9d..5dbe34b 100644
--- a/app/src/main/java/com/sl/house_property/ImagePickerProvider.java
+++ b/app/src/main/java/com/sl/house_property/ImagePickerProvider.java
@@ -1,6 +1,6 @@
 package com.sl.house_property;
 
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 /**
  * 自定义一个Provider，以免和引入的项目的provider冲突
diff --git a/app/src/main/java/com/sl/house_property/Main1Fragment.java b/app/src/main/java/com/sl/house_property/Main1Fragment.java
index 4111b0d..7749532 100644
--- a/app/src/main/java/com/sl/house_property/Main1Fragment.java
+++ b/app/src/main/java/com/sl/house_property/Main1Fragment.java
@@ -8,7 +8,7 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 
@@ -16,7 +16,6 @@ import com.dalong.refreshlayout.OnRefreshListener;
 import com.google.gson.Gson;
 import com.google.gson.internal.LinkedTreeMap;
 import com.google.gson.reflect.TypeToken;
-import com.sl.house_property.f1.AddcararageIttemActivity;
 import com.sl.house_property.user.MyMarketShopActivity;
 import com.sl.house_property.user.MyshopEditAcitivity;
 import com.sl.house_property.databinding.FragmentF1recyclerviewVorizationItemBinding;
diff --git a/app/src/main/java/com/sl/house_property/Main2Fragment.java b/app/src/main/java/com/sl/house_property/Main2Fragment.java
index 4c2a8e3..8cf6db0 100644
--- a/app/src/main/java/com/sl/house_property/Main2Fragment.java
+++ b/app/src/main/java/com/sl/house_property/Main2Fragment.java
@@ -4,17 +4,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 
-import com.gyf.immersionbar.ImmersionBar;
-import com.sl.house_property.f2.ElectricChargeActivity;
 import com.sl.house_property.f2.FeeActivity;
 import com.sl.house_property.databinding.FragmentMain2Binding;
-import com.sl.house_property.f2.GasFeeActivity;
-import com.sl.house_property.f2.ParkingFeeActivity;
-import com.sl.house_property.f2.PropertyFeeActivity;
 
 import tools.Config;
 
diff --git a/app/src/main/java/com/sl/house_property/Main3Fragment.java b/app/src/main/java/com/sl/house_property/Main3Fragment.java
index a78e498..6d125fd 100644
--- a/app/src/main/java/com/sl/house_property/Main3Fragment.java
+++ b/app/src/main/java/com/sl/house_property/Main3Fragment.java
@@ -4,7 +4,7 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.widget.AbsListView;
 import android.widget.ListView;
diff --git a/app/src/main/java/com/sl/house_property/Main4Fragment.java b/app/src/main/java/com/sl/house_property/Main4Fragment.java
index 222f682..c303fc7 100644
--- a/app/src/main/java/com/sl/house_property/Main4Fragment.java
+++ b/app/src/main/java/com/sl/house_property/Main4Fragment.java
@@ -8,9 +8,9 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
-import android.provider.MediaStore;
-import android.support.v4.app.Fragment;
-import android.text.TextUtils;
+
+import androidx.fragment.app.Fragment;
+
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -22,15 +22,10 @@ import android.widget.RelativeLayout;
 import com.cutil.SizeUtils;
 import com.cutil.StringUtils;
 import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.internal.LinkedTreeMap;
-import com.google.gson.reflect.TypeToken;
 import com.sl.house_property.cart.AddressListActivity;
 import com.sl.house_property.databinding.FragmentMain4Binding;
-import com.sl.house_property.db.CommentBeanData;
 import com.sl.house_property.dialog.DialogHelp;
 import com.sl.house_property.discovery.LikeActivity;
-import com.sl.house_property.discovery.ShareCodeActivity;
 import com.sl.house_property.f1.UserdlistActivity;
 import com.sl.house_property.order.OrderActivity;
 import com.sl.house_property.user.MyAuthorizedFamilyHistory;
@@ -44,18 +39,15 @@ import com.sl.house_property.user.MyUserMessage;
 import com.sl.house_property.user.MyWalletActivity;
 import com.squareup.picasso.Picasso;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
 import adapter.BaseRecycleViewAdapter;
-import entity.Advertorial_listEntity;
 import entity.MyUserFEntity;
 import entity.RegisterUser;
 import http.ApiConfig;
@@ -120,18 +112,7 @@ public class Main4Fragment extends BaseFragment<FragmentMain4Binding> implements
                 startActivity(intent);
             }
         });
-        mDataBinding.ll5.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                WebActivitytwo.runActivity(getActivity(), "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
-            }
-        });
-        mDataBinding.ll6.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                WebActivitytwo.runActivity(getActivity(), "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
-            }
-        });
+
         //mDataBinding.myRecyView;
         mDataBinding.userImage.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/java/com/sl/house_property/MainActivity.java b/app/src/main/java/com/sl/house_property/MainActivity.java
index c56f6f6..941633c 100644
--- a/app/src/main/java/com/sl/house_property/MainActivity.java
+++ b/app/src/main/java/com/sl/house_property/MainActivity.java
@@ -6,7 +6,7 @@ import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/com/sl/house_property/MainFragment.java b/app/src/main/java/com/sl/house_property/MainFragment.java
index 149d5ad..aa496f8 100644
--- a/app/src/main/java/com/sl/house_property/MainFragment.java
+++ b/app/src/main/java/com/sl/house_property/MainFragment.java
@@ -6,9 +6,9 @@ import android.content.Intent;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.text.TextPaint;
 import android.text.TextUtils;
 import android.util.Log;
@@ -21,7 +21,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
-import com.alibaba.fastjson.JSON;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.cutil.ScreenUtils;
@@ -34,8 +33,6 @@ import com.lzy.ninegrid.ImageInfo;
 import com.lzy.ninegrid.preview.NineGridViewClickAdapter;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.callback.StringCallback;
-import com.lzy.okgo.model.HttpHeaders;
-import com.lzy.okgo.model.HttpParams;
 import com.lzy.okgo.model.Response;
 import com.lzy.okgo.request.base.Request;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
@@ -53,7 +50,6 @@ import com.sl.house_property.discovery.HistoryRecordActivity;
 import com.sl.house_property.discovery.HistoryRecordActivitytwo;
 import com.sl.house_property.discovery.SelectDialog;
 import com.sl.house_property.okgonet.HttpConstants;
-import com.sl.house_property.okgonet.Observer;
 import com.sl.house_property.order.SettleActivity;
 import com.sl.house_property.user.MyMarketShopActivity;
 import com.sl.house_property.user.MyPropertyActivity;
@@ -91,7 +87,6 @@ import rx.Subscription;
 import rx.functions.Action1;
 import tools.Config;
 import utils.CommonUtils;
-import utils.DateUtils;
 import utils.DateUtilss;
 import utils.JsonUtils;
 import utils.KeyboardUtil;
diff --git a/app/src/main/java/com/sl/house_property/MainTabActivity.java b/app/src/main/java/com/sl/house_property/MainTabActivity.java
index dd9c4b6..c6242f3 100644
--- a/app/src/main/java/com/sl/house_property/MainTabActivity.java
+++ b/app/src/main/java/com/sl/house_property/MainTabActivity.java
@@ -4,15 +4,12 @@ import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.RadioButton;
 import android.widget.RadioGroup;
-import android.widget.TextView;
-import android.widget.Toast;
 
 import com.google.gson.Gson;
 import com.google.gson.internal.LinkedTreeMap;
diff --git a/app/src/main/java/com/sl/house_property/MarkingFinishAwardDialong.java b/app/src/main/java/com/sl/house_property/MarkingFinishAwardDialong.java
index 2f138be..852708b 100644
--- a/app/src/main/java/com/sl/house_property/MarkingFinishAwardDialong.java
+++ b/app/src/main/java/com/sl/house_property/MarkingFinishAwardDialong.java
@@ -2,16 +2,13 @@ package com.sl.house_property;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import utils.SelectPicDanimicActivity;
-
 
 /**
  * Created by 蔡雅楠 on 2018/4/24.
diff --git a/app/src/main/java/com/sl/house_property/MyApplication.java b/app/src/main/java/com/sl/house_property/MyApplication.java
index c498fd9..b201033 100644
--- a/app/src/main/java/com/sl/house_property/MyApplication.java
+++ b/app/src/main/java/com/sl/house_property/MyApplication.java
@@ -4,7 +4,7 @@ import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
 import android.os.StrictMode;
-import android.support.multidex.MultiDex;
+import androidx.multidex.MultiDex;
 import android.util.Log;
 
 import com.lzy.ninegrid.NineGridView;
@@ -33,7 +33,6 @@ import javax.net.ssl.X509TrustManager;
 
 import cn.jpush.android.api.JPushInterface;
 import okhttp3.OkHttpClient;
-import tools.CrashHandler;
 import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard;
 import utils.NineImageLoader;
 //import cn.jpush.im.android.api.JMessageClient;
diff --git a/app/src/main/java/com/sl/house_property/ScrollingActivity.java b/app/src/main/java/com/sl/house_property/ScrollingActivity.java
index b9bcbc4..5e36ed5 100644
--- a/app/src/main/java/com/sl/house_property/ScrollingActivity.java
+++ b/app/src/main/java/com/sl/house_property/ScrollingActivity.java
@@ -1,10 +1,10 @@
 package com.sl.house_property;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 
 public class ScrollingActivity extends AppCompatActivity {
diff --git a/app/src/main/java/com/sl/house_property/SettingActivity.java b/app/src/main/java/com/sl/house_property/SettingActivity.java
index 1a2a3e0..96f3e79 100644
--- a/app/src/main/java/com/sl/house_property/SettingActivity.java
+++ b/app/src/main/java/com/sl/house_property/SettingActivity.java
@@ -59,12 +59,25 @@ public class SettingActivity extends BaseActivity<ActivitySettingBinding> implem
         mDataBinding.id3.setOnClickListener(this);
         mDataBinding.loginout.setOnClickListener(this);
         mDataBinding.id0.setOnClickListener(this);
+
         mDataBinding.myverion.setText("V" + APKVersionCodeUtils.getVerName(SettingActivity.this));
         try {
             mDataBinding.cachsiez.setText(CacheDataManager.getTotalCacheSize(SettingActivity.this));
         } catch (Exception e) {
             e.printStackTrace();
         }
+        mDataBinding.ll5.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                WebActivitytwo.runActivity(SettingActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
+            }
+        });
+        mDataBinding.ll6.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                WebActivitytwo.runActivity(SettingActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
+            }
+        });
     }
 
     @Override
diff --git a/app/src/main/java/com/sl/house_property/WebActivitytwo.java b/app/src/main/java/com/sl/house_property/WebActivitytwo.java
index b514291..f1a7c3a 100644
--- a/app/src/main/java/com/sl/house_property/WebActivitytwo.java
+++ b/app/src/main/java/com/sl/house_property/WebActivitytwo.java
@@ -3,7 +3,7 @@ package com.sl.house_property;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
@@ -11,7 +11,6 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.gyf.immersionbar.ImmersionBar;
diff --git a/app/src/main/java/com/sl/house_property/cart/AddAddressActivity.java b/app/src/main/java/com/sl/house_property/cart/AddAddressActivity.java
index 6932ee0..2028689 100644
--- a/app/src/main/java/com/sl/house_property/cart/AddAddressActivity.java
+++ b/app/src/main/java/com/sl/house_property/cart/AddAddressActivity.java
@@ -3,7 +3,7 @@ package com.sl.house_property.cart;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Toast;
diff --git a/app/src/main/java/com/sl/house_property/cart/AddressListActivity.java b/app/src/main/java/com/sl/house_property/cart/AddressListActivity.java
index c235075..219f72c 100644
--- a/app/src/main/java/com/sl/house_property/cart/AddressListActivity.java
+++ b/app/src/main/java/com/sl/house_property/cart/AddressListActivity.java
@@ -4,9 +4,9 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.View;
 import android.widget.Toast;
 
diff --git a/app/src/main/java/com/sl/house_property/cart/CartFragment.java b/app/src/main/java/com/sl/house_property/cart/CartFragment.java
index c780a67..b6fcfa7 100644
--- a/app/src/main/java/com/sl/house_property/cart/CartFragment.java
+++ b/app/src/main/java/com/sl/house_property/cart/CartFragment.java
@@ -3,8 +3,8 @@ package com.sl.house_property.cart;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Toast;
diff --git a/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java b/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java
index 86957cd..244789f 100644
--- a/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java
+++ b/app/src/main/java/com/sl/house_property/discovery/AddDiscoveryActivity.java
@@ -6,8 +6,10 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.GridLayoutManager;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -16,6 +18,10 @@ import com.gyf.immersionbar.ImmersionBar;
 import com.hjq.permissions.OnPermission;
 import com.hjq.permissions.Permission;
 import com.hjq.permissions.XXPermissions;
+import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.entity.LocalMedia;
+import com.luck.picture.lib.listener.OnResultCallbackListener;
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.interfaces.OnConfirmListener;
 import com.sl.house_property.BaseActivity;
@@ -45,6 +51,7 @@ import okhttp3.MediaType;
 import okhttp3.RequestBody;
 import retrofit2.Response;
 import tools.Config;
+import tools.GlideEngine;
 import top.zibin.luban.Luban;
 import utils.Md5;
 
@@ -199,12 +206,23 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
             @Override
             public void onImageItemClick(int position) {
                 //普通图片被点击
+
                 List<File> imageList = additionImageWrapper.getImageList();
                 ArrayList<String> arrayListOf = new ArrayList<>();
                 for (int i = 0; i < imageList.size(); i++) {
                     arrayListOf.add(imageList.get(i).getAbsolutePath());
+
                 }
                 Intent intent = new Intent(AddDiscoveryActivity.this, ImageViewerAndDeleteActivity.class);
+
+                if (arrayListOf.size() > 0 & arrayListOf.get(0).endsWith("mp4")) {
+                    String s = arrayListOf.get(0);
+                    arrayListOf.clear();
+                    arrayListOf.add(s);
+
+                    intent.putExtra("type", 1);
+                }
+                intent.putStringArrayListExtra("images", arrayListOf);
                 intent.putExtra("index", position);
                 intent.putStringArrayListExtra("images", arrayListOf);
                 startActivityForResult(intent, 111);
@@ -231,17 +249,6 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
             }
             additionImageWrapper.setData(files);
 
-        } else if (requestCode == REQUEST_CODE_SELECT_PICTURE && resultCode == RESULT_OK && data != null) {
-            List<String> strings = Matisse.obtainPathResult(data);
-            ArrayList<File> files = new ArrayList<>(additionImageWrapper.getImageList());
-            try {
-                List<File> list = Luban.with(AddDiscoveryActivity.this).load(strings)
-                        .ignoreBy(100).setTargetDir(getCacheDir().getAbsolutePath()).get();
-                files.addAll(list);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            additionImageWrapper.setData(files);
         } else if (requestCode == 411 && resultCode == RESULT_OK && data != null) {
             List<String> strings = Matisse.obtainPathResult(data);
 
@@ -262,6 +269,127 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
         }
     }
 
+    private void goToSelect() {
+        ArrayList<File> files = new ArrayList<>();
+        int postType = PictureMimeType.ofAll();
+        if (additionImageWrapper.getImageList().size() > 0) {
+            postType = PictureMimeType.ofImage();
+        } else {
+            postType = PictureMimeType.ofAll();
+        }
+        PictureSelector create = PictureSelector.create(this);
+        if (postType == 0) {
+            create.openGallery(postType)
+                    .isCamera(true)
+                    .isWeChatStyle(true)
+                    .maxSelectNum(additionImageWrapper.getRemainCount())
+                    .isPreviewImage(true)
+                    .isPreviewVideo(true)
+                    .isCompress(true)
+                    .videoMaxSecond(20)
+                    .videoMinSecond(2)
+                    .recordVideoSecond(15)
+                    .imageEngine(GlideEngine.createGlideEngine())
+                    .isWithVideoImage(false)
+                    .forResult(new OnResultCallbackListener<LocalMedia>() {
+                        @Override
+                        public void onResult(List<LocalMedia> result) {
+                            if (result != null && result.size() > 0) {
+                                for (int i = 0; i < result.size(); i++) {
+                                    LocalMedia item = result.get(i);
+                                    if (item.getMimeType().startsWith("image")) {
+                                        files.add(new File(item.getCompressPath()));
+                                    } else if (item.getMimeType().startsWith("video")) {
+                                        additionImageWrapper.setLimit(1);
+                                        files.add(new File(item.getRealPath()));
+                                    }
+                                }
+                                additionImageWrapper.setData(files);
+                            }
+                        }
+
+                        @Override
+                        public void onCancel() {
+
+                        }
+                    });
+        }
+    }
+//    private var postType: Int = 0
+//    fun goToSelect() {
+//        if (additionImageWrapper.imageList.size > 0) {
+//            if (postType == 0) {
+//                postType = 1
+//            }
+//        }
+//        val create = PictureSelector.create(this)
+//        if (postType == 0) {
+//            create.openGallery(PictureMimeType.ofAll())
+
+    //
+//                    .forResult(object : OnResultCallbackListener<LocalMedia> {
+//                override fun onResult(result: MutableList<LocalMedia>?) {
+//                    if (!result.isNullOrEmpty()) {
+//                        val mutableListOf = mutableListOf<VideoImagePathEntity>()
+//                        mutableListOf.addAll(additionImageWrapper.imageList)
+//                        for (item in result) {
+//                            if (item.mimeType.startsWith("image")) {
+//                                postType = 1
+//                                mutableListOf.add(VideoImagePathEntity(1, item.compressPath))
+//
+//                            } else if (item.mimeType.startsWith("video")) {
+//                                postType = 2
+//                                WKLog.e(item.realPath)
+//                                mutableListOf.add(VideoImagePathEntity(2, item.realPath))
+//                                additionImageWrapper.setLimit(1)
+//                                WKLog.e(item.path)
+//                                WKLog.e(item.realPath)
+//                            }
+//                        }
+//
+//
+//
+//
+//                        additionImageWrapper.setData(mutableListOf)
+//                    }
+//
+//                }
+//
+//                override fun onCancel() {
+//                }
+//
+//            })
+//        } else if (postType == 1) {
+//            create.openGallery(PictureMimeType.ofImage())
+//                    .isCamera(true)
+//                    .isWeChatStyle(true)
+//                    .maxSelectNum(additionImageWrapper.remainCount)
+//
+//                    .isPreviewImage(true)
+//                    .isPreviewVideo(true)
+//                    .isCompress(true)
+//                    .imageEngine(GlideEngine.createGlideEngine())
+//                    .isWithVideoImage(false)
+//                    .forResult(object : OnResultCallbackListener<LocalMedia> {
+//                override fun onResult(result: MutableList<LocalMedia>?) {
+//                    val mutableListOf = mutableListOf<VideoImagePathEntity>()
+//                    mutableListOf.addAll(additionImageWrapper.imageList)
+//                    if (!result.isNullOrEmpty()) {
+//                        for (item in result) {
+//                            mutableListOf.add(VideoImagePathEntity(1, item.compressPath))
+//                        }
+//                    }
+//                    additionImageWrapper.setData(mutableListOf)
+//                }
+//
+//                override fun onCancel() {
+//                }
+//
+//            })
+//        }
+//
+//
+//    }
     private void selectImage(int requestCode, int max) {
         Matisse
                 .from(this)
@@ -296,7 +424,8 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
             @Override
             public void hasPermission(List<String> granted, boolean isAll) {
                 if (isAll) {
-                    selectImage(requestCode, max);
+                    goToSelect();
+                    //   selectImage(requestCode, max);
                 }
             }
 
@@ -383,15 +512,15 @@ public class AddDiscoveryActivity extends BaseActivity<ActivityAddDiscoveryBindi
 
 
         for (int i = 0; i < additionImageWrapper.getImageList().size(); i++) {
-            map.put("pic" + i + "\"; filename=\"" + additionImageWrapper.getImageList().get(i).getName() + "", RequestBody.create(MediaType.get("multipart/form-data;charset=UTF-8"), additionImageWrapper.getImageList().get(i)));
-            Log.e("xxxx", additionImageWrapper.getImageList().get(i).getName());
+            map.put("pic" + i + "\"; filename=\"" + additionImageWrapper.getImageList().get(i).getName() + "", RequestBody.create(MediaType.get("multipart/form-data"), additionImageWrapper.getImageList().get(i)));
+            Log.e("xxxx", additionImageWrapper.getImageList().get(i).getAbsolutePath());
         }
-        if (file!=null){
-            map.put("pic"+ additionImageWrapper.getImageList().size()+ "\"; filename=\"" + file.getName() + "", RequestBody.create(MediaType.get("multipart/form-data;charset=UTF-8"), file));
+        if (file != null) {
+            map.put("pic" + additionImageWrapper.getImageList().size() + "\"; filename=\"" + file.getName() + "", RequestBody.create(MediaType.get("multipart/form-data"), file));
 
-            map.put("file_count", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), additionImageWrapper.getImageList().size()+1 + ""));
+            map.put("file_count", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), additionImageWrapper.getImageList().size() + 1 + ""));
 
-        }else {
+        } else {
             map.put("file_count", RequestBody.create(MediaType.get("text/plain;charset=UTF-8"), additionImageWrapper.getImageList().size() + ""));
 
         }
diff --git a/app/src/main/java/com/sl/house_property/discovery/AddGoodsDialog.java b/app/src/main/java/com/sl/house_property/discovery/AddGoodsDialog.java
index 84f01d2..716e350 100644
--- a/app/src/main/java/com/sl/house_property/discovery/AddGoodsDialog.java
+++ b/app/src/main/java/com/sl/house_property/discovery/AddGoodsDialog.java
@@ -1,7 +1,7 @@
 package com.sl.house_property.discovery;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
diff --git a/app/src/main/java/com/sl/house_property/discovery/AdditionImageWrapper.java b/app/src/main/java/com/sl/house_property/discovery/AdditionImageWrapper.java
index 924a6ca..9cf4117 100644
--- a/app/src/main/java/com/sl/house_property/discovery/AdditionImageWrapper.java
+++ b/app/src/main/java/com/sl/house_property/discovery/AdditionImageWrapper.java
@@ -1,8 +1,8 @@
 package com.sl.house_property.discovery;
 
 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.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/com/sl/house_property/discovery/BaseFragment.java b/app/src/main/java/com/sl/house_property/discovery/BaseFragment.java
index 6997a87..56f2fa6 100644
--- a/app/src/main/java/com/sl/house_property/discovery/BaseFragment.java
+++ b/app/src/main/java/com/sl/house_property/discovery/BaseFragment.java
@@ -7,9 +7,9 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
 import android.text.TextPaint;
 import android.widget.TextView;
 
diff --git a/app/src/main/java/com/sl/house_property/discovery/CreateTypeSelectDialog.java b/app/src/main/java/com/sl/house_property/discovery/CreateTypeSelectDialog.java
index 2df6c5e..2bdac07 100644
--- a/app/src/main/java/com/sl/house_property/discovery/CreateTypeSelectDialog.java
+++ b/app/src/main/java/com/sl/house_property/discovery/CreateTypeSelectDialog.java
@@ -1,7 +1,7 @@
 package com.sl.house_property.discovery;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 
 import com.lxj.xpopup.core.BottomPopupView;
diff --git a/app/src/main/java/com/sl/house_property/discovery/DeleteCommentDialog.java b/app/src/main/java/com/sl/house_property/discovery/DeleteCommentDialog.java
index 62d092c..d90bc2d 100644
--- a/app/src/main/java/com/sl/house_property/discovery/DeleteCommentDialog.java
+++ b/app/src/main/java/com/sl/house_property/discovery/DeleteCommentDialog.java
@@ -1,7 +1,7 @@
 package com.sl.house_property.discovery;
 
 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/main/java/com/sl/house_property/discovery/DiscoveryFragment.java b/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java
index 7b8c483..0203560 100644
--- a/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java
+++ b/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java
@@ -4,13 +4,12 @@ import android.app.ProgressDialog;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -75,8 +74,6 @@ import tools.Config;
 import tools.PicassoRoundTransform;
 import top.zibin.luban.Luban;
 import utils.CommonUtils;
-import utils.DateUtils;
-import utils.GetJsonDataUtil;
 import utils.KeyboardUtil;
 import utils.Md5;
 import utils.TimeUtils;
diff --git a/app/src/main/java/com/sl/house_property/discovery/GoodsInfoDialog.java b/app/src/main/java/com/sl/house_property/discovery/GoodsInfoDialog.java
index e8ecce5..4e0b1a4 100644
--- a/app/src/main/java/com/sl/house_property/discovery/GoodsInfoDialog.java
+++ b/app/src/main/java/com/sl/house_property/discovery/GoodsInfoDialog.java
@@ -1,9 +1,9 @@
 package com.sl.house_property.discovery;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
diff --git a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java
index 6c6a820..349028a 100644
--- a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java
+++ b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivity.java
@@ -1,17 +1,15 @@
 package com.sl.house_property.discovery;
 
 import android.content.Context;
-import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.util.Log;
 import android.view.View;
 
@@ -24,7 +22,6 @@ import com.gyf.immersionbar.ImmersionBar;
 import com.lzy.ninegrid.ImageInfo;
 import com.lzy.ninegrid.preview.NineGridViewClickAdapter;
 import com.sl.house_property.BaseActivity;
-import com.sl.house_property.MainFragment;
 import com.sl.house_property.MainTabActivity;
 import com.sl.house_property.R;
 import com.sl.house_property.databinding.ItemCommentBinding;
diff --git a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivitytwo.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivitytwo.java
index 4cd9149..af3b9ee 100644
--- a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivitytwo.java
+++ b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordActivitytwo.java
@@ -6,11 +6,11 @@ import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.util.Log;
 import android.view.View;
 
@@ -27,10 +27,8 @@ import com.sl.house_property.MainTabActivity;
 import com.sl.house_property.R;
 import com.sl.house_property.databinding.ItemCommentBinding;
 import com.sl.house_property.databinding.ItemDiscoveryBinding;
-import com.sl.house_property.databinding.LayoutHistoryRecordBinding;
 import com.sl.house_property.databinding.LayoutHistoryRecordtwoBinding;
 import com.sl.house_property.user.AddAnewGranteeActivity;
-import com.sl.house_property.user.MyGuaranteeHistory;
 import com.squareup.picasso.Picasso;
 import com.squareup.picasso.Target;
 
diff --git a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java
index b5795f1..fca8e0a 100644
--- a/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java
+++ b/app/src/main/java/com/sl/house_property/discovery/HistoryRecordFragment.java
@@ -7,9 +7,9 @@ import android.graphics.Rect;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -30,7 +30,6 @@ import com.lzy.ninegrid.preview.NineGridViewClickAdapter;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 import com.sl.house_property.BaseFragment;
-import com.sl.house_property.DoConfig;
 import com.sl.house_property.MainTabActivity;
 import com.sl.house_property.R;
 import com.sl.house_property.databinding.FragmentHistoryRecordBinding;
@@ -65,7 +64,6 @@ import utils.CommonUtils;
 import utils.DateUtils;
 import utils.KeyboardUtil;
 import utils.Md5;
-import utils.SPUtils;
 import utils.UtilHelpers;
 
 public class HistoryRecordFragment extends BaseFragment<FragmentHistoryRecordBinding> implements MainTabActivity.MyOnTouchListener {
diff --git a/app/src/main/java/com/sl/house_property/discovery/ImageViewerAdapter.java b/app/src/main/java/com/sl/house_property/discovery/ImageViewerAdapter.java
index a0f1e22..de6ed02 100644
--- a/app/src/main/java/com/sl/house_property/discovery/ImageViewerAdapter.java
+++ b/app/src/main/java/com/sl/house_property/discovery/ImageViewerAdapter.java
@@ -1,7 +1,7 @@
 package com.sl.house_property.discovery;
 
 import android.content.Context;
-import android.support.v4.view.PagerAdapter;
+import androidx.viewpager.widget.PagerAdapter;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/com/sl/house_property/discovery/ImageViewerAndDeleteActivity.java b/app/src/main/java/com/sl/house_property/discovery/ImageViewerAndDeleteActivity.java
index c4ef840..2033b9f 100644
--- a/app/src/main/java/com/sl/house_property/discovery/ImageViewerAndDeleteActivity.java
+++ b/app/src/main/java/com/sl/house_property/discovery/ImageViewerAndDeleteActivity.java
@@ -2,10 +2,14 @@ package com.sl.house_property.discovery;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
+
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
+
+import android.util.Log;
 import android.view.View;
 
+import com.lzy.ninegrid.preview.MediaController;
 import com.sl.house_property.BaseActivity;
 import com.sl.house_property.R;
 import com.sl.house_property.databinding.ActivityImagePreviewAndDeleteBinding;
@@ -16,7 +20,7 @@ public class ImageViewerAndDeleteActivity extends BaseActivity<ActivityImagePrev
 
     private ArrayList<String> mList;
     private ImageViewerAdapter adapter;
-    private int index;
+    private int index=0;
 
     @Override
     protected int getLayoutResId() {
@@ -27,49 +31,92 @@ public class ImageViewerAndDeleteActivity extends BaseActivity<ActivityImagePrev
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mList = getIntent().getStringArrayListExtra("images");
-        index = getIntent().getIntExtra("index", 0);
-        adapter = new ImageViewerAdapter(this, mList);
-        mDataBinding.tvTitle.setText(getString(R.string.text_preview_index, index + 1, mList.size()));
+        int type = getIntent().getIntExtra("type", 0);
+        if (type == 0) {
+            mList = getIntent().getStringArrayListExtra("images");
+            index = getIntent().getIntExtra("index", 0);
+            adapter = new ImageViewerAdapter(this, mList);
+            mDataBinding.vpPreview.setAdapter(adapter);
+            mDataBinding.vpPreview.setCurrentItem(index);
+            mDataBinding.vpPreview.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+                @Override
+                public void onPageScrolled(int i, float v, int i1) {
+
+                }
+
+                @Override
+                public void onPageSelected(int i) {
+                    mDataBinding.tvTitle.setText(getString(R.string.text_preview_index, i + 1, mList.size()));
+                    index = i;
+                }
+
+                @Override
+                public void onPageScrollStateChanged(int i) {
+
+                }
+            });
+
+            mDataBinding.tvDelete.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mList.size() == 1) {
+                        mList.remove(index);
+                        Intent intent = new Intent();
+                        intent.putStringArrayListExtra("images", mList);
+                        setResult(111, intent);
+                        finish();
+                    } else {
+                        mList.remove(index);
+                        adapter.notifyDataSetChanged();
+                        mDataBinding.tvTitle.setText(getString(R.string.text_preview_index, index + 1, mList.size()));
+                    }
+
+                }
+            });
+        } else {
+            mList = getIntent().getStringArrayListExtra("images");
+            mDataBinding.flVideo.setVisibility(View.VISIBLE);
+            mDataBinding.flParent.setVisibility(View.GONE);
+            Log.e("xxxx",mList.get(0));
+            mDataBinding. pLVideoView.setVideoPath(mList.get(0));
+            MediaController mMediaController = new MediaController(this);
+            mDataBinding. pLVideoView.setMediaController(mMediaController);
+            mDataBinding. pLVideoView.start();
+            mDataBinding.tvDelete.setOnClickListener(v -> {
 
-        mDataBinding.tvDelete.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mList.size() == 1) {
                     mList.remove(index);
                     Intent intent = new Intent();
                     intent.putStringArrayListExtra("images", mList);
                     setResult(111, intent);
                     finish();
-                } else {
-                    mList.remove(index);
-                    adapter.notifyDataSetChanged();
-                    mDataBinding.tvTitle.setText(getString(R.string.text_preview_index, index + 1, mList.size()));
-                }
 
-            }
-        });
-        mDataBinding.vpPreview.setAdapter(adapter);
-        mDataBinding.vpPreview.setCurrentItem(index);
-        mDataBinding.vpPreview.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int i, float v, int i1) {
+            });
+        }
 
-            }
 
-            @Override
-            public void onPageSelected(int i) {
-                mDataBinding.tvTitle.setText(getString(R.string.text_preview_index, i + 1, mList.size()));
-                index = i;
-            }
+        mDataBinding.tvTitle.setText(getString(R.string.text_preview_index, index + 1, mList.size()));
 
-            @Override
-            public void onPageScrollStateChanged(int i) {
 
-            }
-        });
+
+    }
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mDataBinding.pLVideoView.start();
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mDataBinding.  pLVideoView.pause();
+
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mDataBinding.  pLVideoView.stopPlayback();
+    }
     @Override
     public void onBackPressed() {
         //返回操作后的数据
diff --git a/app/src/main/java/com/sl/house_property/discovery/LikeActivity.java b/app/src/main/java/com/sl/house_property/discovery/LikeActivity.java
index 3dabdf6..4f96773 100644
--- a/app/src/main/java/com/sl/house_property/discovery/LikeActivity.java
+++ b/app/src/main/java/com/sl/house_property/discovery/LikeActivity.java
@@ -1,8 +1,8 @@
 package com.sl.house_property.discovery;
 
 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 com.sl.house_property.BaseActivity;
 import com.sl.house_property.MainTabActivity;
diff --git a/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java b/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java
index 398f684..8470ef7 100644
--- a/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java
+++ b/app/src/main/java/com/sl/house_property/discovery/LikeFragment.java
@@ -1,9 +1,9 @@
 package com.sl.house_property.discovery;
 
 import android.os.Bundle;
-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.LayoutInflater;
 import android.view.View;
 
diff --git a/app/src/main/java/com/sl/house_property/discovery/MobanFragment.java b/app/src/main/java/com/sl/house_property/discovery/MobanFragment.java
index a223c0c..579d1b5 100644
--- a/app/src/main/java/com/sl/house_property/discovery/MobanFragment.java
+++ b/app/src/main/java/com/sl/house_property/discovery/MobanFragment.java
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/com/sl/house_property/discovery/PhotoViewPager.java b/app/src/main/java/com/sl/house_property/discovery/PhotoViewPager.java
index 778cc8c..ace44a5 100644
--- a/app/src/main/java/com/sl/house_property/discovery/PhotoViewPager.java
+++ b/app/src/main/java/com/sl/house_property/discovery/PhotoViewPager.java
@@ -1,7 +1,7 @@
 package com.sl.house_property.discovery;
 
 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/sl/house_property/discovery/PropertyActivity.java b/app/src/main/java/com/sl/house_property/discovery/PropertyActivity.java
index 3322dcc..03d0653 100644
--- a/app/src/main/java/com/sl/house_property/discovery/PropertyActivity.java
+++ b/app/src/main/java/com/sl/house_property/discovery/PropertyActivity.java
@@ -1,7 +1,7 @@
 package com.sl.house_property.discovery;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
 import android.view.View;
 
 import com.gyf.immersionbar.ImmersionBar;
diff --git a/app/src/main/java/com/sl/house_property/discovery/SelectDialog.java b/app/src/main/java/com/sl/house_property/discovery/SelectDialog.java
index 71e0a10..81c7e70 100644
--- a/app/src/main/java/com/sl/house_property/discovery/SelectDialog.java
+++ b/app/src/main/java/com/sl/house_property/discovery/SelectDialog.java
@@ -1,7 +1,7 @@
 package com.sl.house_property.discovery;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 
 import com.lxj.xpopup.core.BottomPopupView;
diff --git a/app/src/main/java/com/sl/house_property/discovery/ShareCodeActivity.java b/app/src/main/java/com/sl/house_property/discovery/ShareCodeActivity.java
index 5778545..3c1e37a 100644
--- a/app/src/main/java/com/sl/house_property/discovery/ShareCodeActivity.java
+++ b/app/src/main/java/com/sl/house_property/discovery/ShareCodeActivity.java
@@ -1,15 +1,14 @@
 package com.sl.house_property.discovery;
 
 import android.os.Bundle;
-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 androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.RadioGroup;
-import android.widget.Toast;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.google.gson.Gson;
@@ -18,7 +17,6 @@ import com.google.gson.reflect.TypeToken;
 import com.lxj.xpopup.XPopup;
 import com.selectpicker.OptionsPopupWindow;
 import com.sl.house_property.BaseActivity;
-import com.sl.house_property.DoConfig;
 import com.sl.house_property.R;
 import com.sl.house_property.db.CommentBeanData;
 import com.sl.house_property.db.dao.CommentDao;
@@ -44,10 +42,8 @@ import my_loader.Resultcode;
 import rx.Subscription;
 import rx.functions.Action1;
 import tools.Config;
-import utils.DateUtils;
 import utils.DateUtilss;
 import utils.Md5;
-import utils.SPUtils;
 
 public class ShareCodeActivity extends BaseActivity<com.sl.house_property.databinding.ActivityEntranceguardControl2Binding> {
 
diff --git a/app/src/main/java/com/sl/house_property/discovery/ShareCodeDialog.java b/app/src/main/java/com/sl/house_property/discovery/ShareCodeDialog.java
index 7395650..856805a 100644
--- a/app/src/main/java/com/sl/house_property/discovery/ShareCodeDialog.java
+++ b/app/src/main/java/com/sl/house_property/discovery/ShareCodeDialog.java
@@ -2,7 +2,7 @@ package com.sl.house_property.discovery;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.Html;
 import android.view.View;
 import android.widget.ImageView;
diff --git a/app/src/main/java/com/sl/house_property/message/GlideRoundTransform.java b/app/src/main/java/com/sl/house_property/message/GlideRoundTransform.java
index cb0da11..c4a71a2 100644
--- a/app/src/main/java/com/sl/house_property/message/GlideRoundTransform.java
+++ b/app/src/main/java/com/sl/house_property/message/GlideRoundTransform.java
@@ -6,7 +6,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.RectF;
 import android.graphics.Shader;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
diff --git a/app/src/main/java/com/sl/house_property/message/MessageAdapter.java b/app/src/main/java/com/sl/house_property/message/MessageAdapter.java
index df48e3f..169566f 100644
--- a/app/src/main/java/com/sl/house_property/message/MessageAdapter.java
+++ b/app/src/main/java/com/sl/house_property/message/MessageAdapter.java
@@ -22,7 +22,7 @@ public class MessageAdapter extends BaseQuickAdapter<MessageEntity.StoreInfo, Ba
                 .into(baseViewHolder.itemView.<ImageView>findViewById(R.id.iv));
         baseViewHolder.setText(R.id.tv_name, messageEntity.getStore_name());
         baseViewHolder.setText(R.id.tv_title, messageEntity.getTitle());
-        baseViewHolder.setText(R.id.tv_time, TimeUtils.getRecentTimeSpanByNow(TimeUtils.dataOne(messageEntity.getCtime())));
+        baseViewHolder.setText(R.id.tv_time, messageEntity.getCtime());
         if (messageEntity.getIs_dot().equals("1")) {
             baseViewHolder.getView(R.id.view).setVisibility(View.VISIBLE);
         } else {
diff --git a/app/src/main/java/com/sl/house_property/message/MessageEntity.java b/app/src/main/java/com/sl/house_property/message/MessageEntity.java
index 6723013..7c9c79e 100644
--- a/app/src/main/java/com/sl/house_property/message/MessageEntity.java
+++ b/app/src/main/java/com/sl/house_property/message/MessageEntity.java
@@ -1,6 +1,6 @@
 package com.sl.house_property.message;
 
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/sl/house_property/message/MessageFragment.java b/app/src/main/java/com/sl/house_property/message/MessageFragment.java
index a97f9e8..3a75032 100644
--- a/app/src/main/java/com/sl/house_property/message/MessageFragment.java
+++ b/app/src/main/java/com/sl/house_property/message/MessageFragment.java
@@ -1,14 +1,12 @@
 package com.sl.house_property.message;
 
-import android.app.Activity;
-import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,8 +16,6 @@ import android.widget.Toast;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.google.gson.Gson;
 import com.google.gson.internal.LinkedTreeMap;
-import com.google.gson.reflect.TypeToken;
-import com.gyf.immersionbar.ImmersionBar;
 import com.scwang.smartrefresh.layout.SmartRefreshLayout;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
@@ -29,8 +25,6 @@ import com.sl.house_property.WebActivitytwo;
 
 import org.jetbrains.annotations.NotNull;
 
-import java.lang.reflect.Type;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/app/src/main/java/com/sl/house_property/order/OrderActivity.java b/app/src/main/java/com/sl/house_property/order/OrderActivity.java
index 8fae9ef..8c8882d 100644
--- a/app/src/main/java/com/sl/house_property/order/OrderActivity.java
+++ b/app/src/main/java/com/sl/house_property/order/OrderActivity.java
@@ -4,9 +4,9 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.View;
 
 import com.bumptech.glide.Glide;
diff --git a/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java b/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java
index ad2bb19..db88f03 100644
--- a/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java
+++ b/app/src/main/java/com/sl/house_property/order/OrderDetailActivity.java
@@ -4,8 +4,8 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.View;
 
 import com.bumptech.glide.Glide;
diff --git a/app/src/main/java/com/sl/house_property/order/PayActivity.java b/app/src/main/java/com/sl/house_property/order/PayActivity.java
index 18b48ed..96eeebe 100644
--- a/app/src/main/java/com/sl/house_property/order/PayActivity.java
+++ b/app/src/main/java/com/sl/house_property/order/PayActivity.java
@@ -6,7 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
 
diff --git a/app/src/main/java/com/sl/house_property/order/SettleActivity.java b/app/src/main/java/com/sl/house_property/order/SettleActivity.java
index fb36801..cb15727 100644
--- a/app/src/main/java/com/sl/house_property/order/SettleActivity.java
+++ b/app/src/main/java/com/sl/house_property/order/SettleActivity.java
@@ -4,8 +4,8 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.View;
 
 import com.bumptech.glide.Glide;
diff --git a/app/src/main/java/com/sl/house_property/order/WxPayEntity.java b/app/src/main/java/com/sl/house_property/order/WxPayEntity.java
index 02e505f..4e1c154 100644
--- a/app/src/main/java/com/sl/house_property/order/WxPayEntity.java
+++ b/app/src/main/java/com/sl/house_property/order/WxPayEntity.java
@@ -1,6 +1,6 @@
 package com.sl.house_property.order;
 
-import android.support.annotation.Keep;
+import androidx.annotation.Keep;
 
 @Keep
 public class WxPayEntity {
diff --git a/app/src/main/java/com/sl/house_property/user/AddAnewGranteeActivity.java b/app/src/main/java/com/sl/house_property/user/AddAnewGranteeActivity.java
index edd97ed..6242e7b 100644
--- a/app/src/main/java/com/sl/house_property/user/AddAnewGranteeActivity.java
+++ b/app/src/main/java/com/sl/house_property/user/AddAnewGranteeActivity.java
@@ -5,7 +5,7 @@ import android.app.DatePickerDialog;
 import android.app.TimePickerDialog;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
@@ -14,19 +14,15 @@ import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.provider.MediaStore;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.DatePicker;
-import android.widget.RadioGroup;
 import android.widget.TimePicker;
-import android.widget.Toast;
 
 import com.selectpicker.OptionsPopupWindow;
 import com.cutil.FileUtils;
@@ -39,7 +35,6 @@ import com.google.gson.reflect.TypeToken;
 import com.sl.house_property.BaseActivity;
 import com.sl.house_property.R;
 import com.sl.house_property.databinding.ActivityAddAnewGranteeBinding;
-import com.sl.house_property.databinding.PopwindowLayoutBinding;
 
 import java.io.File;
 import java.io.IOException;
@@ -64,15 +59,12 @@ import my_view.SelectPictureWayDialog;
 import my_view.SelectRepairWayDialog;
 import my_view.tao_bao_refresh.my_drag_recyle_view.example.listener.OnItemOnclikListener;
 import my_view.tao_bao_refresh.my_drag_recyle_view.example.callback.ItemDragHelperCallback;
-import my_view.tao_bao_refresh.my_drag_recyle_view.example.divider.RecyclerViewDivider;
 import my_view.tao_bao_refresh.my_drag_recyle_view.recycle.MyRecyclerView;
 import my_view.tao_bao_refresh.my_drag_recyle_view.recyledapter.RecycleAdapter;
 import rx.Subscription;
 import rx.functions.Action1;
 import tools.Config;
 import tools.DateTimeUtils;
-import tools.ImageCompress;
-import tools.PopupWindowHelper;
 import tools.time.CustomTimePicker;
 import http.ApiConfig;
 import http.FileUpLoad.retrofit.HttpStaticApi;
@@ -82,7 +74,6 @@ import okhttp3.RequestBody;
 import retrofit2.Response;
 import utils.BitmapTools;
 import utils.Md5;
-import utils.MyPhoneValue;
 import utils.SelectPicDanimicActivity;
 
 public class AddAnewGranteeActivity extends BaseActivity<ActivityAddAnewGranteeBinding> implements View.OnClickListener, RetrofitCallBack {
diff --git a/app/src/main/java/com/sl/house_property/user/AddFamilyDialog.java b/app/src/main/java/com/sl/house_property/user/AddFamilyDialog.java
index fdb38a2..79d233c 100644
--- a/app/src/main/java/com/sl/house_property/user/AddFamilyDialog.java
+++ b/app/src/main/java/com/sl/house_property/user/AddFamilyDialog.java
@@ -1,7 +1,7 @@
 package com.sl.house_property.user;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
diff --git a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
index 0c81e80..d862c59 100644
--- a/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
+++ b/app/src/main/java/com/sl/house_property/user/MyAuthorizedFamilyHistory.java
@@ -1,16 +1,12 @@
 package com.sl.house_property.user;
 
-import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
-import android.view.Gravity;
 import android.view.View;
-import android.widget.Toast;
 
-import com.dalong.refreshlayout.OnRefreshListener;
 import com.google.gson.Gson;
 import com.google.gson.internal.LinkedTreeMap;
 import com.google.gson.reflect.TypeToken;
diff --git a/app/src/main/java/com/sl/house_property/user/MyGranteeDetailActivity.java b/app/src/main/java/com/sl/house_property/user/MyGranteeDetailActivity.java
index 1c32381..24ba619 100644
--- a/app/src/main/java/com/sl/house_property/user/MyGranteeDetailActivity.java
+++ b/app/src/main/java/com/sl/house_property/user/MyGranteeDetailActivity.java
@@ -2,42 +2,34 @@ package com.sl.house_property.user;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.helper.ItemTouchHelper;
-import android.view.Gravity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
+
 import android.view.View;
-import android.widget.Toast;
 
 import com.cutil.SizeUtils;
 import com.google.gson.Gson;
 import com.google.gson.internal.LinkedTreeMap;
 import com.google.gson.reflect.TypeToken;
-import com.sl.house_property.BR;
 import com.sl.house_property.BaseActivity;
 import com.sl.house_property.R;
 import com.sl.house_property.databinding.ActivityMyGranteeDetailBinding;
-import com.sl.house_property.databinding.ItemRecycler1Binding;
-import com.squareup.picasso.Picasso;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.File;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import adapter.BaseRecycleViewAdapter;
 import entity.RegisterUser;
 import entity.RepairDetailEntity;
 import entity.Repair_listEntity;
 import imageselector.FullScreenOnlinePreviewActivity;
 import my_loader.Loader;
 import my_loader.Resultcode;
-import my_view.ConfirmForGaranteeDetailDialog;
 import my_view.RecyclerViewSpacesItemDecoration;
-import my_view.tao_bao_refresh.FullyGridLayoutManager;
 import my_view.tao_bao_refresh.my_drag_recyle_view.example.callback.ItemDragHelperCallback;
 import my_view.tao_bao_refresh.my_drag_recyle_view.example.listener.OnItemOnclikListener;
 import my_view.tao_bao_refresh.my_drag_recyle_view.recycle.MyRecyclerView;
diff --git a/app/src/main/java/com/sl/house_property/user/MyshopEditAcitivity.java b/app/src/main/java/com/sl/house_property/user/MyshopEditAcitivity.java
index 08882f0..c5c2e9b 100644
--- a/app/src/main/java/com/sl/house_property/user/MyshopEditAcitivity.java
+++ b/app/src/main/java/com/sl/house_property/user/MyshopEditAcitivity.java
@@ -12,26 +12,20 @@ import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.provider.MediaStore;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.text.Editable;
-import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.widget.Toast;
 
 import com.cutil.FileUtils;
 import com.cutil.ImageUtils;
 import com.cutil.RegexUtils;
 import com.cutil.SizeUtils;
-import com.cutil.Utils;
 import com.sl.house_property.BaseActivity;
-import com.sl.house_property.Main1Fragment;
-import com.sl.house_property.MainTabActivity;
 import com.sl.house_property.R;
 import com.sl.house_property.databinding.ActivityMyshopEditAcitivityBinding;
 
@@ -39,7 +33,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import entity.RegisterUser;
@@ -55,7 +48,6 @@ import my_view.tao_bao_refresh.my_drag_recyle_view.example.divider.RecyclerViewD
 import my_view.tao_bao_refresh.my_drag_recyle_view.recycle.MyRecyclerView;
 import my_view.tao_bao_refresh.my_drag_recyle_view.recyledapter.RecycleAdapter;
 import tools.Config;
-import tools.ImageCompress;
 import http.ApiConfig;
 import http.FileUpLoad.retrofit.HttpStaticApi;
 import http.FileUpLoad.retrofit.RetrofitCallBack;
@@ -65,8 +57,6 @@ import retrofit2.Response;
 import utils.BitmapTools;
 import utils.IndentTextWatcher;
 import utils.Md5;
-import utils.MyPhoneValue;
-import utils.SelectPicDanimicActivity;
 
 public class MyshopEditAcitivity extends BaseActivity<ActivityMyshopEditAcitivityBinding> implements View.OnClickListener, RetrofitCallBack {
     private static final int REQUEST_CODE = 0x00000011;
diff --git a/app/src/main/java/com/sl/house_property/user/MyshopModifyAcitivity.java b/app/src/main/java/com/sl/house_property/user/MyshopModifyAcitivity.java
index 5d2273f..3f03cb5 100644
--- a/app/src/main/java/com/sl/house_property/user/MyshopModifyAcitivity.java
+++ b/app/src/main/java/com/sl/house_property/user/MyshopModifyAcitivity.java
@@ -12,14 +12,13 @@ import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.provider.MediaStore;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.helper.ItemTouchHelper;
-import android.view.Gravity;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.ItemTouchHelper;
+
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.widget.Toast;
 
 import com.cutil.FileUtils;
 import com.cutil.ImageUtils;
diff --git a/app/src/main/java/entity/Advert_carouseleEntity.java b/app/src/main/java/entity/Advert_carouseleEntity.java
index 2f424e1..3c445b4 100644
--- a/app/src/main/java/entity/Advert_carouseleEntity.java
+++ b/app/src/main/java/entity/Advert_carouseleEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 
 import com.sl.house_property.BR;
diff --git a/app/src/main/java/entity/Advertorial_listEntity.java b/app/src/main/java/entity/Advertorial_listEntity.java
index c847065..0bcfebc 100644
--- a/app/src/main/java/entity/Advertorial_listEntity.java
+++ b/app/src/main/java/entity/Advertorial_listEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/BillItem.java b/app/src/main/java/entity/BillItem.java
index bf9e94a..ae49aef 100644
--- a/app/src/main/java/entity/BillItem.java
+++ b/app/src/main/java/entity/BillItem.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/entity/CarDarageUsedDetailEntity.java b/app/src/main/java/entity/CarDarageUsedDetailEntity.java
index ec523b2..a9045cf 100644
--- a/app/src/main/java/entity/CarDarageUsedDetailEntity.java
+++ b/app/src/main/java/entity/CarDarageUsedDetailEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/CarEntity.java b/app/src/main/java/entity/CarEntity.java
index 28262ed..8ec6a8f 100644
--- a/app/src/main/java/entity/CarEntity.java
+++ b/app/src/main/java/entity/CarEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/DiscoveryListEntity.java b/app/src/main/java/entity/DiscoveryListEntity.java
index 03e309a..53e3da2 100644
--- a/app/src/main/java/entity/DiscoveryListEntity.java
+++ b/app/src/main/java/entity/DiscoveryListEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.support.annotation.Keep;
+import androidx.databinding.BaseObservable;
+import androidx.annotation.Keep;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/app/src/main/java/entity/FeeEntity.java b/app/src/main/java/entity/FeeEntity.java
index 5811ae8..564179e 100644
--- a/app/src/main/java/entity/FeeEntity.java
+++ b/app/src/main/java/entity/FeeEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/GarageEntity.java b/app/src/main/java/entity/GarageEntity.java
index d9b0b64..7e896e4 100644
--- a/app/src/main/java/entity/GarageEntity.java
+++ b/app/src/main/java/entity/GarageEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/Garage_user.java b/app/src/main/java/entity/Garage_user.java
index 826d571..151152c 100644
--- a/app/src/main/java/entity/Garage_user.java
+++ b/app/src/main/java/entity/Garage_user.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 
 import com.sl.house_property.BR;
diff --git a/app/src/main/java/entity/HomeEntity.java b/app/src/main/java/entity/HomeEntity.java
index f4c9856..15f663e 100644
--- a/app/src/main/java/entity/HomeEntity.java
+++ b/app/src/main/java/entity/HomeEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/HomelistitemEntity.java b/app/src/main/java/entity/HomelistitemEntity.java
index 180d915..0fe3d06 100644
--- a/app/src/main/java/entity/HomelistitemEntity.java
+++ b/app/src/main/java/entity/HomelistitemEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/HousekeepingItemDetailEntity.java b/app/src/main/java/entity/HousekeepingItemDetailEntity.java
index 6de3c31..4b32123 100644
--- a/app/src/main/java/entity/HousekeepingItemDetailEntity.java
+++ b/app/src/main/java/entity/HousekeepingItemDetailEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/KeyEntity.java b/app/src/main/java/entity/KeyEntity.java
index dc4c9cc..d6eade7 100644
--- a/app/src/main/java/entity/KeyEntity.java
+++ b/app/src/main/java/entity/KeyEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 import com.sl.house_property.BR;
 import java.io.Serializable;
 
diff --git a/app/src/main/java/entity/MainF1Entity.java b/app/src/main/java/entity/MainF1Entity.java
index 33e8d1e..dc0a9dd 100644
--- a/app/src/main/java/entity/MainF1Entity.java
+++ b/app/src/main/java/entity/MainF1Entity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 import com.sl.house_property.BR;
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/app/src/main/java/entity/Message_listEntity.java b/app/src/main/java/entity/Message_listEntity.java
index 1f06e00..6732513 100644
--- a/app/src/main/java/entity/Message_listEntity.java
+++ b/app/src/main/java/entity/Message_listEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 import com.sl.house_property.BR;
 import java.io.Serializable;
 
diff --git a/app/src/main/java/entity/MyCaragraItemEntity.java b/app/src/main/java/entity/MyCaragraItemEntity.java
index 16d60ca..7030af4 100644
--- a/app/src/main/java/entity/MyCaragraItemEntity.java
+++ b/app/src/main/java/entity/MyCaragraItemEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/MyHomequEntity.java b/app/src/main/java/entity/MyHomequEntity.java
index 9863653..2471295 100644
--- a/app/src/main/java/entity/MyHomequEntity.java
+++ b/app/src/main/java/entity/MyHomequEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/entity/MyShopMaketEntity.java b/app/src/main/java/entity/MyShopMaketEntity.java
index 4aa0aa3..376c742 100644
--- a/app/src/main/java/entity/MyShopMaketEntity.java
+++ b/app/src/main/java/entity/MyShopMaketEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/MySimpleHomequEntity.java b/app/src/main/java/entity/MySimpleHomequEntity.java
index e85629d..3e42523 100644
--- a/app/src/main/java/entity/MySimpleHomequEntity.java
+++ b/app/src/main/java/entity/MySimpleHomequEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 import com.sl.house_property.BR;
 import java.io.Serializable;
 
diff --git a/app/src/main/java/entity/MyTitileEntity.java b/app/src/main/java/entity/MyTitileEntity.java
index ac5f6e1..337ed1d 100644
--- a/app/src/main/java/entity/MyTitileEntity.java
+++ b/app/src/main/java/entity/MyTitileEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 import android.view.View;
 
 
diff --git a/app/src/main/java/entity/MyUserFEntity.java b/app/src/main/java/entity/MyUserFEntity.java
index 87c8d6d..940e072 100644
--- a/app/src/main/java/entity/MyUserFEntity.java
+++ b/app/src/main/java/entity/MyUserFEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 import com.sl.house_property.BR;
 public class MyUserFEntity<T> extends BaseObservable
 {@Bindable
diff --git a/app/src/main/java/entity/MyfamilySimpleEntity.java b/app/src/main/java/entity/MyfamilySimpleEntity.java
index 58d5779..9c5e4b4 100644
--- a/app/src/main/java/entity/MyfamilySimpleEntity.java
+++ b/app/src/main/java/entity/MyfamilySimpleEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/PayFessEentity.java b/app/src/main/java/entity/PayFessEentity.java
index 919f9fe..bcfa4eb 100644
--- a/app/src/main/java/entity/PayFessEentity.java
+++ b/app/src/main/java/entity/PayFessEentity.java
@@ -1,12 +1,11 @@
 package entity;
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
 import java.io.Serializable;
 import java.util. ArrayList;
-import java.util.List;
 
 public class PayFessEentity extends BaseObservable implements Serializable {
 
diff --git a/app/src/main/java/entity/RegisterUser.java b/app/src/main/java/entity/RegisterUser.java
index f9649a5..13deb47 100644
--- a/app/src/main/java/entity/RegisterUser.java
+++ b/app/src/main/java/entity/RegisterUser.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/RentEntity.java b/app/src/main/java/entity/RentEntity.java
index 4308dce..bac2968 100644
--- a/app/src/main/java/entity/RentEntity.java
+++ b/app/src/main/java/entity/RentEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 import com.sl.house_property.BR;
 import java.io.Serializable;
 
diff --git a/app/src/main/java/entity/Rent_info_Entity.java b/app/src/main/java/entity/Rent_info_Entity.java
index b3ec3fb..b0bb4a3 100644
--- a/app/src/main/java/entity/Rent_info_Entity.java
+++ b/app/src/main/java/entity/Rent_info_Entity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/RepairDetailEntity.java b/app/src/main/java/entity/RepairDetailEntity.java
index cbbf012..8ef9878 100644
--- a/app/src/main/java/entity/RepairDetailEntity.java
+++ b/app/src/main/java/entity/RepairDetailEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/Repair_listEntity.java b/app/src/main/java/entity/Repair_listEntity.java
index 1c6648c..238f97a 100644
--- a/app/src/main/java/entity/Repair_listEntity.java
+++ b/app/src/main/java/entity/Repair_listEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/Serve_categoryeNTITY.java b/app/src/main/java/entity/Serve_categoryeNTITY.java
index 75e7f7f..ad9558b 100644
--- a/app/src/main/java/entity/Serve_categoryeNTITY.java
+++ b/app/src/main/java/entity/Serve_categoryeNTITY.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 import com.sl.house_property.BR;
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/app/src/main/java/entity/ServiceRecord.java b/app/src/main/java/entity/ServiceRecord.java
index 27b8cc6..cbc883c 100644
--- a/app/src/main/java/entity/ServiceRecord.java
+++ b/app/src/main/java/entity/ServiceRecord.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/entity/ServiceRecordDetail.java b/app/src/main/java/entity/ServiceRecordDetail.java
index 1a89b46..4f8cdf1 100644
--- a/app/src/main/java/entity/ServiceRecordDetail.java
+++ b/app/src/main/java/entity/ServiceRecordDetail.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/app/src/main/java/entity/SimpleEntity.java b/app/src/main/java/entity/SimpleEntity.java
index 0a40385..158bd1f 100644
--- a/app/src/main/java/entity/SimpleEntity.java
+++ b/app/src/main/java/entity/SimpleEntity.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import com.sl.house_property.BR;
 
diff --git a/app/src/main/java/entity/UserInfo.java b/app/src/main/java/entity/UserInfo.java
index ccccdc4..34cd8af 100644
--- a/app/src/main/java/entity/UserInfo.java
+++ b/app/src/main/java/entity/UserInfo.java
@@ -1,7 +1,7 @@
 package entity;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/imageselector/ClipImageActivity.java b/app/src/main/java/imageselector/ClipImageActivity.java
index 9aa6ccf..33b78e7 100644
--- a/app/src/main/java/imageselector/ClipImageActivity.java
+++ b/app/src/main/java/imageselector/ClipImageActivity.java
@@ -9,7 +9,7 @@ import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
diff --git a/app/src/main/java/imageselector/FullScreenOnlinePreviewActivity.java b/app/src/main/java/imageselector/FullScreenOnlinePreviewActivity.java
index 77e5088..09c5d0e 100644
--- a/app/src/main/java/imageselector/FullScreenOnlinePreviewActivity.java
+++ b/app/src/main/java/imageselector/FullScreenOnlinePreviewActivity.java
@@ -8,9 +8,9 @@ import android.content.res.Resources;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -18,12 +18,9 @@ import android.widget.TextView;
 
 import com.sl.house_property.R;
 
-import java.io.File;
 import java.util.ArrayList;
 
-import imageselector.adapter.FullScreenImagePagerAdapter;
 import imageselector.adapter.FullScreenOnlineImagePagerAdapter;
-import imageselector.entry.Image;
 import imageselector.utils.ImageSelector;
 import imageselector.view.MyViewPager;
 
diff --git a/app/src/main/java/imageselector/FullScreenPreviewActivity.java b/app/src/main/java/imageselector/FullScreenPreviewActivity.java
index a5463a3..5655023 100644
--- a/app/src/main/java/imageselector/FullScreenPreviewActivity.java
+++ b/app/src/main/java/imageselector/FullScreenPreviewActivity.java
@@ -1,27 +1,19 @@
 package imageselector;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
-import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Color;
-import android.graphics.drawable.BitmapDrawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.FrameLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.sl.house_property.R;
@@ -30,7 +22,6 @@ import java.io.File;
 import java.util.ArrayList;
 
 import imageselector.adapter.FullScreenImagePagerAdapter;
-import imageselector.adapter.ImagePagerAdapter;
 import imageselector.entry.Image;
 import imageselector.utils.ImageSelector;
 import imageselector.view.MyViewPager;
diff --git a/app/src/main/java/imageselector/ImageSelectorActivity.java b/app/src/main/java/imageselector/ImageSelectorActivity.java
index 9a6af52..5be3a59 100644
--- a/app/src/main/java/imageselector/ImageSelectorActivity.java
+++ b/app/src/main/java/imageselector/ImageSelectorActivity.java
@@ -19,17 +19,17 @@ import android.os.Environment;
 import android.os.Handler;
 import android.provider.MediaStore;
 import android.provider.Settings;
-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.v4.content.FileProvider;
-import android.support.v4.os.EnvironmentCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.SimpleItemAnimator;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
+import androidx.core.os.EnvironmentCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
diff --git a/app/src/main/java/imageselector/PreviewActivity.java b/app/src/main/java/imageselector/PreviewActivity.java
index ba487ee..1f7a887 100644
--- a/app/src/main/java/imageselector/PreviewActivity.java
+++ b/app/src/main/java/imageselector/PreviewActivity.java
@@ -14,9 +14,9 @@ import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
diff --git a/app/src/main/java/imageselector/adapter/FolderAdapter.java b/app/src/main/java/imageselector/adapter/FolderAdapter.java
index 64d28f4..7921767 100644
--- a/app/src/main/java/imageselector/adapter/FolderAdapter.java
+++ b/app/src/main/java/imageselector/adapter/FolderAdapter.java
@@ -1,7 +1,7 @@
 package imageselector.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/app/src/main/java/imageselector/adapter/FullScreenImagePagerAdapter.java b/app/src/main/java/imageselector/adapter/FullScreenImagePagerAdapter.java
index c6f2677..eada83c 100644
--- a/app/src/main/java/imageselector/adapter/FullScreenImagePagerAdapter.java
+++ b/app/src/main/java/imageselector/adapter/FullScreenImagePagerAdapter.java
@@ -3,9 +3,9 @@ package imageselector.adapter;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
diff --git a/app/src/main/java/imageselector/adapter/FullScreenOnlineImagePagerAdapter.java b/app/src/main/java/imageselector/adapter/FullScreenOnlineImagePagerAdapter.java
index fa61d3e..d310e05 100644
--- a/app/src/main/java/imageselector/adapter/FullScreenOnlineImagePagerAdapter.java
+++ b/app/src/main/java/imageselector/adapter/FullScreenOnlineImagePagerAdapter.java
@@ -3,9 +3,9 @@ package imageselector.adapter;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -18,7 +18,6 @@ import com.bumptech.glide.request.transition.Transition;
 import com.github.chrisbanes.photoview.PhotoView;
 import com.github.chrisbanes.photoview.PhotoViewAttacher;
 
-import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
diff --git a/app/src/main/java/imageselector/adapter/ImageAdapter.java b/app/src/main/java/imageselector/adapter/ImageAdapter.java
index 8a554dd..fed0c78 100644
--- a/app/src/main/java/imageselector/adapter/ImageAdapter.java
+++ b/app/src/main/java/imageselector/adapter/ImageAdapter.java
@@ -1,7 +1,7 @@
 package imageselector.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/app/src/main/java/imageselector/adapter/ImagePagerAdapter.java b/app/src/main/java/imageselector/adapter/ImagePagerAdapter.java
index 2d3724d..f2b227e 100644
--- a/app/src/main/java/imageselector/adapter/ImagePagerAdapter.java
+++ b/app/src/main/java/imageselector/adapter/ImagePagerAdapter.java
@@ -3,9 +3,9 @@ package imageselector.adapter;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.PagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
diff --git a/app/src/main/java/imageselector/utils/ImageSelector.java b/app/src/main/java/imageselector/utils/ImageSelector.java
index 8185caf..b7d0295 100644
--- a/app/src/main/java/imageselector/utils/ImageSelector.java
+++ b/app/src/main/java/imageselector/utils/ImageSelector.java
@@ -1,7 +1,7 @@
 package imageselector.utils;
 
 import android.app.Activity;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/imageselector/view/ClipImageView.java b/app/src/main/java/imageselector/view/ClipImageView.java
index 02a75b0..fea71dc 100644
--- a/app/src/main/java/imageselector/view/ClipImageView.java
+++ b/app/src/main/java/imageselector/view/ClipImageView.java
@@ -12,7 +12,7 @@ import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Xfermode;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.view.MotionEvent;
diff --git a/app/src/main/java/imageselector/view/MyViewPager.java b/app/src/main/java/imageselector/view/MyViewPager.java
index 0328419..712dd6c 100644
--- a/app/src/main/java/imageselector/view/MyViewPager.java
+++ b/app/src/main/java/imageselector/view/MyViewPager.java
@@ -1,7 +1,7 @@
 package imageselector.view;
 
 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/imageselector/view/SquareImageView.java b/app/src/main/java/imageselector/view/SquareImageView.java
index a50d4bf..9380178 100644
--- a/app/src/main/java/imageselector/view/SquareImageView.java
+++ b/app/src/main/java/imageselector/view/SquareImageView.java
@@ -1,7 +1,7 @@
 package imageselector.view;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
 /**
diff --git a/app/src/main/java/my_view/CommentDialog.java b/app/src/main/java/my_view/CommentDialog.java
index 168c6fd..813c138 100644
--- a/app/src/main/java/my_view/CommentDialog.java
+++ b/app/src/main/java/my_view/CommentDialog.java
@@ -2,7 +2,7 @@ package my_view;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 import android.widget.TextView;
 
diff --git a/app/src/main/java/my_view/EmojiEditText.java b/app/src/main/java/my_view/EmojiEditText.java
index b4c3a1f..8a98004 100644
--- a/app/src/main/java/my_view/EmojiEditText.java
+++ b/app/src/main/java/my_view/EmojiEditText.java
@@ -11,7 +11,7 @@ import android.util.AttributeSet;
  * Created by Administrator on 2017/5/4.
  */
 
-public class EmojiEditText extends android.support.v7.widget.AppCompatEditText {
+public class EmojiEditText extends androidx.appcompat.widget.AppCompatEditText {
     // 输入表情前的光标位置
     private int cursorPos; // 输入表情前EditText中的文本
     private String inputAfterText; // 是否重置了EditText的内容
diff --git a/app/src/main/java/my_view/MyFrameLayout.java b/app/src/main/java/my_view/MyFrameLayout.java
index a1135fb..b13d456 100644
--- a/app/src/main/java/my_view/MyFrameLayout.java
+++ b/app/src/main/java/my_view/MyFrameLayout.java
@@ -3,14 +3,13 @@ package my_view;
 import android.content.Context;
 import android.graphics.Rect;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.text.Layout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
 import android.util.AttributeSet;
 import android.view.WindowInsets;
 import android.widget.FrameLayout;
-import android.widget.LinearLayout;
 
 public class MyFrameLayout extends FrameLayout {
 
diff --git a/app/src/main/java/my_view/RadiolistDialog.java b/app/src/main/java/my_view/RadiolistDialog.java
index 726ef55..e7043e7 100644
--- a/app/src/main/java/my_view/RadiolistDialog.java
+++ b/app/src/main/java/my_view/RadiolistDialog.java
@@ -3,7 +3,7 @@ package my_view;
 
 import android.app.Dialog;
 import android.content.Context;
-import android.databinding.DataBindingUtil;
+import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/app/src/main/java/my_view/RecyclerViewSpacesItemDecoration.java b/app/src/main/java/my_view/RecyclerViewSpacesItemDecoration.java
index 8163b39..f04cfdf 100644
--- a/app/src/main/java/my_view/RecyclerViewSpacesItemDecoration.java
+++ b/app/src/main/java/my_view/RecyclerViewSpacesItemDecoration.java
@@ -1,7 +1,7 @@
 package my_view;
 
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 import java.util.HashMap;
diff --git a/app/src/main/java/my_view/mysnackbar/AnimationUtils.java b/app/src/main/java/my_view/mysnackbar/AnimationUtils.java
index 200b463..b1f702e 100644
--- a/app/src/main/java/my_view/mysnackbar/AnimationUtils.java
+++ b/app/src/main/java/my_view/mysnackbar/AnimationUtils.java
@@ -1,7 +1,7 @@
 package my_view.mysnackbar;
 
 
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import android.view.animation.Animation;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
diff --git a/app/src/main/java/my_view/mysnackbar/TSnackbar.java b/app/src/main/java/my_view/mysnackbar/TSnackbar.java
index a9f65e4..3c49f6f 100644
--- a/app/src/main/java/my_view/mysnackbar/TSnackbar.java
+++ b/app/src/main/java/my_view/mysnackbar/TSnackbar.java
@@ -14,16 +14,16 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.ColorInt;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.SwipeDismissBehavior;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPropertyAnimatorListenerAdapter;
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.google.android.material.behavior.SwipeDismissBehavior;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.ViewPropertyAnimatorListenerAdapter;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
diff --git a/app/src/main/java/my_view/tao_bao_refresh/FullyGridLayoutManager.java b/app/src/main/java/my_view/tao_bao_refresh/FullyGridLayoutManager.java
index 938b54b..5635aa7 100644
--- a/app/src/main/java/my_view/tao_bao_refresh/FullyGridLayoutManager.java
+++ b/app/src/main/java/my_view/tao_bao_refresh/FullyGridLayoutManager.java
@@ -1,8 +1,8 @@
 package my_view.tao_bao_refresh;
 
 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.view.View;
 import android.view.ViewGroup;
 
diff --git a/app/src/main/java/my_view/tao_bao_refresh/FullyLinearLayoutManager.java b/app/src/main/java/my_view/tao_bao_refresh/FullyLinearLayoutManager.java
index aef6d33..c93118c 100644
--- a/app/src/main/java/my_view/tao_bao_refresh/FullyLinearLayoutManager.java
+++ b/app/src/main/java/my_view/tao_bao_refresh/FullyLinearLayoutManager.java
@@ -5,8 +5,8 @@ package my_view.tao_bao_refresh;
  */
 
 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.Log;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/app/src/main/java/my_view/tao_bao_refresh/RecyView.java b/app/src/main/java/my_view/tao_bao_refresh/RecyView.java
index cf58410..055a9c9 100644
--- a/app/src/main/java/my_view/tao_bao_refresh/RecyView.java
+++ b/app/src/main/java/my_view/tao_bao_refresh/RecyView.java
@@ -1,8 +1,8 @@
 package my_view.tao_bao_refresh;
 
 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;
 
 /**
diff --git a/app/src/main/java/my_view/tao_bao_refresh/SpacesItemDecoration.java b/app/src/main/java/my_view/tao_bao_refresh/SpacesItemDecoration.java
index 0de5e68..5b7c245 100644
--- a/app/src/main/java/my_view/tao_bao_refresh/SpacesItemDecoration.java
+++ b/app/src/main/java/my_view/tao_bao_refresh/SpacesItemDecoration.java
@@ -1,7 +1,7 @@
 package my_view.tao_bao_refresh;
 
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 public class SpacesItemDecoration extends RecyclerView.ItemDecoration {
diff --git a/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/example/callback/ItemDragHelperCallback.java b/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/example/callback/ItemDragHelperCallback.java
index cdd2fea..a5131c3 100644
--- a/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/example/callback/ItemDragHelperCallback.java
+++ b/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/example/callback/ItemDragHelperCallback.java
@@ -1,8 +1,8 @@
 package my_view.tao_bao_refresh.my_drag_recyle_view.example.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;
 
 /**
  * Created by Administrator on 2016/7/19 0019.
diff --git a/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/example/divider/RecyclerViewDivider.java b/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/example/divider/RecyclerViewDivider.java
index 539ec28..f30e5ce 100644
--- a/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/example/divider/RecyclerViewDivider.java
+++ b/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/example/divider/RecyclerViewDivider.java
@@ -6,9 +6,9 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**
diff --git a/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/example/listener/OnItemOnclikListener.java b/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/example/listener/OnItemOnclikListener.java
index be15135..09c9dee 100644
--- a/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/example/listener/OnItemOnclikListener.java
+++ b/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/example/listener/OnItemOnclikListener.java
@@ -1,6 +1,6 @@
 package my_view.tao_bao_refresh.my_drag_recyle_view.example.listener;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**
diff --git a/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recycle/MyRecyclerView.java b/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recycle/MyRecyclerView.java
index 8479909..dd34406 100644
--- a/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recycle/MyRecyclerView.java
+++ b/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recycle/MyRecyclerView.java
@@ -2,8 +2,8 @@ package my_view.tao_bao_refresh.my_drag_recyle_view.recycle;
 
 import android.content.Context;
 import android.os.Handler;
-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;
 import android.view.View;
diff --git a/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recycle/UrlMyRecyclerView.java b/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recycle/UrlMyRecyclerView.java
index 2d9f2eb..c374710 100644
--- a/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recycle/UrlMyRecyclerView.java
+++ b/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recycle/UrlMyRecyclerView.java
@@ -2,8 +2,8 @@ package my_view.tao_bao_refresh.my_drag_recyle_view.recycle;
 
 import android.content.Context;
 import android.os.Handler;
-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;
 import android.view.View;
@@ -11,7 +11,6 @@ import android.widget.ImageView;
 
 import com.sl.house_property.R;
 
-import my_view.tao_bao_refresh.my_drag_recyle_view.recyledapter.RecycleAdapter;
 import my_view.tao_bao_refresh.my_drag_recyle_view.recyledapter.UrlRecycleAdapter;
 
 
diff --git a/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recyledapter/RecycleAdapter.java b/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recyledapter/RecycleAdapter.java
index ac61511..60b72c8 100644
--- a/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recyledapter/RecycleAdapter.java
+++ b/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recyledapter/RecycleAdapter.java
@@ -1,7 +1,7 @@
 package my_view.tao_bao_refresh.my_drag_recyle_view.recyledapter;
 
 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/my_view/tao_bao_refresh/my_drag_recyle_view/recyledapter/UrlRecycleAdapter.java b/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recyledapter/UrlRecycleAdapter.java
index ae8fae5..d1e0f6e 100644
--- a/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recyledapter/UrlRecycleAdapter.java
+++ b/app/src/main/java/my_view/tao_bao_refresh/my_drag_recyle_view/recyledapter/UrlRecycleAdapter.java
@@ -1,7 +1,7 @@
 package my_view.tao_bao_refresh.my_drag_recyle_view.recyledapter;
 
 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;
@@ -9,17 +9,12 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.request.RequestOptions;
 import com.sl.house_property.R;
 import com.squareup.picasso.Picasso;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 
-import http.ApiConfig;
 import my_view.tao_bao_refresh.my_drag_recyle_view.example.callback.ItemDragHelperCallback;
 import my_view.tao_bao_refresh.my_drag_recyle_view.example.listener.OnItemOnclikListener;
 import my_view.tao_bao_refresh.my_drag_recyle_view.recycle.MyRecyclerView;
diff --git a/app/src/main/java/tools/GlideEngine.java b/app/src/main/java/tools/GlideEngine.java
new file mode 100644
index 0000000..2124e8c
--- /dev/null
+++ b/app/src/main/java/tools/GlideEngine.java
@@ -0,0 +1,232 @@
+package tools;
+
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.PointF;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.target.BitmapImageViewTarget;
+import com.bumptech.glide.request.target.ImageViewTarget;
+import com.luck.picture.lib.engine.ImageEngine;
+import com.luck.picture.lib.listener.OnImageCompleteCallback;
+import com.luck.picture.lib.tools.MediaUtils;
+import com.luck.picture.lib.widget.longimage.ImageSource;
+import com.luck.picture.lib.widget.longimage.ImageViewState;
+import com.luck.picture.lib.widget.longimage.SubsamplingScaleImageView;
+import com.sl.house_property.R;
+
+/**
+ * @author：luck
+ * @date：2019-11-13 17:02
+ * @describe：Glide加载引擎
+ */
+public class GlideEngine implements ImageEngine {
+
+    /**
+     * 加载图片
+     *
+     * @param context
+     * @param url
+     * @param imageView
+     */
+    @Override
+    public void loadImage(@NonNull Context context, @NonNull String url, @NonNull ImageView imageView) {
+        Glide.with(context)
+                .load(url)
+                .into(imageView);
+    }
+
+    /**
+     * 加载网络图片适配长图方案
+     * # 注意：此方法只有加载网络图片才会回调
+     *
+     * @param context
+     * @param url
+     * @param imageView
+     * @param longImageView
+     * @param callback      网络图片加载回调监听 {link after version 2.5.1 Please use the #OnImageCompleteCallback#}
+     */
+    @Override
+    public void loadImage(@NonNull Context context, @NonNull String url,
+                          @NonNull final ImageView imageView,
+                          final SubsamplingScaleImageView longImageView, final OnImageCompleteCallback callback) {
+        Glide.with(context)
+                .asBitmap()
+                .load(url)
+                .into(new ImageViewTarget<Bitmap>(imageView) {
+                    @Override
+                    public void onLoadStarted(@Nullable Drawable placeholder) {
+                        super.onLoadStarted(placeholder);
+                        if (callback != null) {
+                            callback.onShowLoading();
+                        }
+                    }
+
+                    @Override
+                    public void onLoadFailed(@Nullable Drawable errorDrawable) {
+                        super.onLoadFailed(errorDrawable);
+                        if (callback != null) {
+                            callback.onHideLoading();
+                        }
+                    }
+
+                    @Override
+                    protected void setResource(@Nullable Bitmap resource) {
+                        if (callback != null) {
+                            callback.onHideLoading();
+                        }
+                        if (resource != null) {
+                            boolean eqLongImage = MediaUtils.isLongImg(resource.getWidth(),
+                                    resource.getHeight());
+                            longImageView.setVisibility(eqLongImage ? View.VISIBLE : View.GONE);
+                            imageView.setVisibility(eqLongImage ? View.GONE : View.VISIBLE);
+                            if (eqLongImage) {
+                                // 加载长图
+                                longImageView.setQuickScaleEnabled(true);
+                                longImageView.setZoomEnabled(true);
+                                longImageView.setDoubleTapZoomDuration(100);
+                                longImageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP);
+                                longImageView.setDoubleTapZoomDpi(SubsamplingScaleImageView.ZOOM_FOCUS_CENTER);
+                                longImageView.setImage(ImageSource.cachedBitmap(resource),
+                                        new ImageViewState(0, new PointF(0, 0), 0));
+                            } else {
+                                // 普通图片
+                                imageView.setImageBitmap(resource);
+                            }
+                        }
+                    }
+                });
+    }
+//
+//    /**
+//     * 加载网络图片适配长图方案
+//     * # 注意：此方法只有加载网络图片才会回调
+//     *
+//     * @param context
+//     * @param url
+//     * @param imageView
+//     * @param longImageView
+//     * @ 已废弃
+//     */
+//    @Override
+//    public void loadImage(@NonNull Context context, @NonNull String url,
+//                          @NonNull final ImageView imageView,
+//                          final SubsamplingScaleImageView longImageView) {
+//        Glide.with(context)
+//                .asBitmap()
+//                .load(url)
+//                .into(new ImageViewTarget<Bitmap>(imageView) {
+//                    @Override
+//                    protected void setResource(@Nullable Bitmap resource) {
+//                        if (resource != null) {
+//                            boolean eqLongImage = MediaUtils.isLongImg(resource.getWidth(),
+//                                    resource.getHeight());
+//                            longImageView.setVisibility(eqLongImage ? View.VISIBLE : View.GONE);
+//                            imageView.setVisibility(eqLongImage ? View.GONE : View.VISIBLE);
+//                            if (eqLongImage) {
+//                                // 加载长图
+//                                longImageView.setQuickScaleEnabled(true);
+//                                longImageView.setZoomEnabled(true);
+//                                longImageView.setDoubleTapZoomDuration(100);
+//                                longImageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP);
+//                                longImageView.setDoubleTapZoomDpi(SubsamplingScaleImageView.ZOOM_FOCUS_CENTER);
+//                                longImageView.setImage(ImageSource.cachedBitmap(resource),
+//                                        new ImageViewState(0, new PointF(0, 0), 0));
+//                            } else {
+//                                // 普通图片
+//                                imageView.setImageBitmap(resource);
+//                            }
+//                        }
+//                    }
+//                });
+//    }
+
+    /**
+     * 加载相册目录
+     *
+     * @param context   上下文
+     * @param url       图片路径
+     * @param imageView 承载图片ImageView
+     */
+    @Override
+    public void loadFolderImage(@NonNull final Context context, @NonNull String url, @NonNull final ImageView imageView) {
+        Glide.with(context)
+                .asBitmap()
+                .load(url)
+
+                .override(180, 180)
+                .centerCrop()
+                .sizeMultiplier(0.5f)
+                .placeholder(R.drawable.picture_image_placeholder)
+                .into(new BitmapImageViewTarget(imageView) {
+                    @Override
+                    protected void setResource(Bitmap resource) {
+                        RoundedBitmapDrawable circularBitmapDrawable =
+                                RoundedBitmapDrawableFactory.
+                                        create(context.getResources(), resource);
+                        circularBitmapDrawable.setCornerRadius(8);
+                        imageView.setImageDrawable(circularBitmapDrawable);
+                    }
+                });
+    }
+
+
+    /**
+     * 加载gif
+     *
+     * @param context   上下文
+     * @param url       图片路径
+     * @param imageView 承载图片ImageView
+     */
+   
+    public void loadAsGifImage(@NonNull Context context, @NonNull String url,
+                               @NonNull ImageView imageView) {
+        Glide.with(context)
+                .asGif()
+                .load(url)
+                .into(imageView);
+    }
+
+    /**
+     * 加载图片列表图片
+     *
+     * @param context   上下文
+     * @param url       图片路径
+     * @param imageView 承载图片ImageView
+     */
+    @Override
+    public void loadGridImage(@NonNull Context context, @NonNull String url, @NonNull ImageView imageView) {
+        Glide.with(context)
+                .load(url)
+                .override(200, 200)
+                .centerCrop()
+                .placeholder(R.drawable.picture_image_placeholder)
+                .into(imageView);
+    }
+
+
+    private GlideEngine() {
+    }
+
+    private static GlideEngine instance;
+
+    public static GlideEngine createGlideEngine() {
+        if (null == instance) {
+            synchronized (GlideEngine.class) {
+                if (null == instance) {
+                    instance = new GlideEngine();
+                }
+            }
+        }
+        return instance;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/tools/MyDateclient.java b/app/src/main/java/tools/MyDateclient.java
index ef2b7e1..cd5a31d 100644
--- a/app/src/main/java/tools/MyDateclient.java
+++ b/app/src/main/java/tools/MyDateclient.java
@@ -9,7 +9,7 @@ import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.CalendarContract;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.text.TextUtils;
 
 import java.util.Calendar;
diff --git a/app/src/main/java/utils/BottomNavigationViewHelper.java b/app/src/main/java/utils/BottomNavigationViewHelper.java
index 7e7af58..4fd1cf5 100644
--- a/app/src/main/java/utils/BottomNavigationViewHelper.java
+++ b/app/src/main/java/utils/BottomNavigationViewHelper.java
@@ -1,9 +1,9 @@
 package utils;
 
 import android.annotation.SuppressLint;
-import android.support.design.internal.BottomNavigationItemView;
-import android.support.design.internal.BottomNavigationMenuView;
-import android.support.design.widget.BottomNavigationView;
+import com.google.android.material.bottomnavigation.BottomNavigationItemView;
+import com.google.android.material.bottomnavigation.BottomNavigationMenuView;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
 import android.util.Log;
 
 import java.lang.reflect.Field;
diff --git a/app/src/main/java/utils/QRCodeUtil.java b/app/src/main/java/utils/QRCodeUtil.java
index b12ddef..ebfb914 100644
--- a/app/src/main/java/utils/QRCodeUtil.java
+++ b/app/src/main/java/utils/QRCodeUtil.java
@@ -3,8 +3,8 @@ package utils;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Color;
-import android.support.annotation.ColorInt;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.google.zxing.BarcodeFormat;
diff --git a/app/src/main/java/utils/SelectPicDanimicActivity.java b/app/src/main/java/utils/SelectPicDanimicActivity.java
index dbb1583..9869a66 100644
--- a/app/src/main/java/utils/SelectPicDanimicActivity.java
+++ b/app/src/main/java/utils/SelectPicDanimicActivity.java
@@ -7,12 +7,11 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.provider.MediaStore;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
diff --git a/app/src/main/java/utils/TimeConstants.java b/app/src/main/java/utils/TimeConstants.java
index d446091..63892cb 100644
--- a/app/src/main/java/utils/TimeConstants.java
+++ b/app/src/main/java/utils/TimeConstants.java
@@ -2,7 +2,7 @@ package utils;
 
 
 
-import android.support.annotation.IntDef;
+import androidx.annotation.IntDef;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/app/src/main/res/layout/activity_add_discovery.xml b/app/src/main/res/layout/activity_add_discovery.xml
index c99b1b9..f2eb2ef 100644
--- a/app/src/main/res/layout/activity_add_discovery.xml
+++ b/app/src/main/res/layout/activity_add_discovery.xml
@@ -46,7 +46,7 @@
 
         </LinearLayout>
 
-        <android.support.v4.widget.NestedScrollView
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/white">
@@ -87,7 +87,7 @@
                         android:textSize="14sp" />
                 </LinearLayout>
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_dynamic_image"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -110,7 +110,7 @@
                     android:textColor="@color/black"
                     android:textSize="14sp" />
 
-                <android.support.v7.widget.RecyclerView
+                <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rec2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -120,7 +120,7 @@
 
             </LinearLayout>
 
-        </android.support.v4.widget.NestedScrollView>
+        </androidx.core.widget.NestedScrollView>
 
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_address_list.xml b/app/src/main/res/layout/activity_address_list.xml
index 559306a..ec8fea9 100644
--- a/app/src/main/res/layout/activity_address_list.xml
+++ b/app/src/main/res/layout/activity_address_list.xml
@@ -60,7 +60,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rec"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/activity_entranceguard_control2.xml b/app/src/main/res/layout/activity_entranceguard_control2.xml
index 269b5b1..faa3cc4 100644
--- a/app/src/main/res/layout/activity_entranceguard_control2.xml
+++ b/app/src/main/res/layout/activity_entranceguard_control2.xml
@@ -170,7 +170,7 @@
                         android:textColor="@color/white" />
 
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv_list"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_image_preview_and_delete.xml b/app/src/main/res/layout/activity_image_preview_and_delete.xml
index 058e9ac..405ffe9 100644
--- a/app/src/main/res/layout/activity_image_preview_and_delete.xml
+++ b/app/src/main/res/layout/activity_image_preview_and_delete.xml
@@ -55,7 +55,18 @@
 
 
         </FrameLayout>
+        <FrameLayout
+            android:id="@+id/fl_video"
 
+            android:background="@android:color/black"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+        <com.pili.pldroid.player.widget.PLVideoView
+            android:id="@+id/pLVideoView"
 
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center" />
+        </FrameLayout>
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_image_select.xml b/app/src/main/res/layout/activity_image_select.xml
index ec6d22b..390d62b 100644
--- a/app/src/main/res/layout/activity_image_select.xml
+++ b/app/src/main/res/layout/activity_image_select.xml
@@ -72,7 +72,7 @@
 
     </RelativeLayout>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -106,7 +106,7 @@
         android:background="#c4111212"
         android:visibility="gone" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_folder"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0cfad77..3b274cd 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,14 +9,14 @@
     android:background="@color/white"
     >
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/startPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true">
 
-    </android.support.v4.view.ViewPager>
+    </androidx.viewpager.widget.ViewPager>
     <LinearLayout
         android:orientation="horizontal"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_my_authorized_family_history.xml b/app/src/main/res/layout/activity_my_authorized_family_history.xml
index 7b40e66..75963ce 100644
--- a/app/src/main/res/layout/activity_my_authorized_family_history.xml
+++ b/app/src/main/res/layout/activity_my_authorized_family_history.xml
@@ -37,13 +37,13 @@
                         android:layout_height="match_parent">
 
 
-                        <android.support.v7.widget.RecyclerView
+                        <androidx.recyclerview.widget.RecyclerView
                             android:layout_width="match_parent"
                             android:id="@+id/recy_view"
 
                             android:layout_height="match_parent">
 
-                        </android.support.v7.widget.RecyclerView>
+                        </androidx.recyclerview.widget.RecyclerView>
 
 
                     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_order.xml b/app/src/main/res/layout/activity_order.xml
index c968352..790ac44 100644
--- a/app/src/main/res/layout/activity_order.xml
+++ b/app/src/main/res/layout/activity_order.xml
@@ -48,7 +48,7 @@
             <com.scwang.smartrefresh.layout.header.ClassicsHeader
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rec"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/activity_order_detail.xml b/app/src/main/res/layout/activity_order_detail.xml
index e737adb..e1e79da 100644
--- a/app/src/main/res/layout/activity_order_detail.xml
+++ b/app/src/main/res/layout/activity_order_detail.xml
@@ -117,7 +117,7 @@
 
                         />
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_scrolling.xml b/app/src/main/res/layout/activity_scrolling.xml
index 24463c7..0bfd455 100644
--- a/app/src/main/res/layout/activity_scrolling.xml
+++ b/app/src/main/res/layout/activity_scrolling.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -7,7 +7,7 @@
     android:fitsSystemWindows="true"
     tools:context=".ScrollingActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
         android:layout_width="match_parent"
         android:layout_height="@dimen/app_bar_height"
@@ -15,7 +15,7 @@
 
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/toolbar_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -24,19 +24,19 @@
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
             app:toolbarId="@+id/toolbar">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 app:layout_collapseMode="pin"
                 app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-        </android.support.design.widget.CollapsingToolbarLayout>
-    </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_scrolling" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -45,4 +45,4 @@
         app:layout_anchorGravity="bottom|end"
         app:srcCompat="@android:drawable/ic_dialog_email" />
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 28e1d55..a3c1223 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -178,6 +178,88 @@
                     android:layout_marginRight="20dip"
                     android:src="@mipmap/returnme" />
             </LinearLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+
+
+                android:background="@color/light" />
+            <LinearLayout
+                android:id="@+id/ll_5"
+                android:background="@color/white"
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:layout_height="50dp">
+                <ImageView
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="16dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/icon_privacy"
+                    />
+                <TextView
+
+                    android:layout_marginLeft="16dp"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical"
+                    android:textSize="16sp"
+                    android:textColor="#000"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:text="隐私政策"
+
+                    />
+                <ImageView
+                    android:layout_marginRight="16dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:src="@mipmap/returnme"
+
+                    />
+
+            </LinearLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+
+
+                android:background="@color/light" />
+            <LinearLayout
+                android:id="@+id/ll_6"
+                android:background="@color/white"
+                android:layout_width="match_parent"
+                android:orientation="horizontal"
+                android:layout_height="50dp">
+                <ImageView
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="16dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@mipmap/icon_privacy"
+                    />
+                <TextView
+
+                    android:layout_marginLeft="16dp"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical"
+                    android:textSize="16sp"
+                    android:textColor="#000"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:text="用户协议"
+
+                    />
+                <ImageView
+                    android:layout_marginRight="16dp"
+                    android:layout_gravity="center_vertical"
+                    android:layout_width="15dp"
+                    android:layout_height="15dp"
+                    android:src="@mipmap/returnme"
+
+                    />
+
+            </LinearLayout>
 
             <View
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_settle.xml b/app/src/main/res/layout/activity_settle.xml
index 1a2d0ae..56ddf27 100644
--- a/app/src/main/res/layout/activity_settle.xml
+++ b/app/src/main/res/layout/activity_settle.xml
@@ -103,7 +103,7 @@
                             android:text="jksdbasdbnasdjansdmasnd.,masnd.asm,dn" />
                     </RelativeLayout>
 
-                    <android.support.v7.widget.RecyclerView
+                    <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/rv"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/content_scrolling.xml b/app/src/main/res/layout/content_scrolling.xml
index 74a90f5..0ea7fb2 100644
--- a/app/src/main/res/layout/content_scrolling.xml
+++ b/app/src/main/res/layout/content_scrolling.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -14,4 +14,4 @@
         android:layout_margin="@dimen/text_margin"
         android:text="@string/large_text" />
 
-</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_goods_info.xml b/app/src/main/res/layout/dialog_goods_info.xml
index 8f1d3d6..901705e 100644
--- a/app/src/main/res/layout/dialog_goods_info.xml
+++ b/app/src/main/res/layout/dialog_goods_info.xml
@@ -70,7 +70,7 @@
             android:textColor="@color/black"
             android:textSize="14sp" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_cart.xml b/app/src/main/res/layout/fragment_cart.xml
index deb3d29..510fca9 100644
--- a/app/src/main/res/layout/fragment_cart.xml
+++ b/app/src/main/res/layout/fragment_cart.xml
@@ -50,7 +50,7 @@
             <com.scwang.smartrefresh.layout.header.ClassicsHeader
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/rec"
 
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_discovery.xml b/app/src/main/res/layout/fragment_discovery.xml
index 93485a9..3e58dd3 100644
--- a/app/src/main/res/layout/fragment_discovery.xml
+++ b/app/src/main/res/layout/fragment_discovery.xml
@@ -105,13 +105,13 @@
                             android:layout_height="match_parent">
 
 
-                            <android.support.v7.widget.RecyclerView
+                            <androidx.recyclerview.widget.RecyclerView
                                 android:id="@+id/recy_view"
 
                                 android:layout_width="match_parent"
                                 android:layout_height="match_parent">
 
-                            </android.support.v7.widget.RecyclerView>
+                            </androidx.recyclerview.widget.RecyclerView>
 
 
                         </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_history_record.xml b/app/src/main/res/layout/fragment_history_record.xml
index f49b5ce..ff1d38b 100644
--- a/app/src/main/res/layout/fragment_history_record.xml
+++ b/app/src/main/res/layout/fragment_history_record.xml
@@ -67,13 +67,13 @@
                         android:layout_height="match_parent">
 
 
-                        <android.support.v7.widget.RecyclerView
+                        <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/recy_view"
 
                             android:layout_width="match_parent"
                             android:layout_height="match_parent">
 
-                        </android.support.v7.widget.RecyclerView>
+                        </androidx.recyclerview.widget.RecyclerView>
 
 
                     </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_like.xml b/app/src/main/res/layout/fragment_like.xml
index 582f89c..c5189a5 100644
--- a/app/src/main/res/layout/fragment_like.xml
+++ b/app/src/main/res/layout/fragment_like.xml
@@ -38,7 +38,7 @@
 
         </RelativeLayout>
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/tb"
             android:visibility="gone"
             android:background="@color/white"
@@ -49,13 +49,13 @@
             app:tabIndicatorFullWidth="false"
             app:tabTextColor="#000"
             android:gravity="center_horizontal" />
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/fl"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/white">
 
-        </android.support.v4.view.ViewPager>
+        </androidx.viewpager.widget.ViewPager>
 
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index f6ada3f..d55e425 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -191,7 +191,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="match_parent">
 
-                            <android.support.v7.widget.RecyclerView
+                            <androidx.recyclerview.widget.RecyclerView
                                 android:id="@+id/recyView"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/fragment_main4.xml b/app/src/main/res/layout/fragment_main4.xml
index d0f522a..6e43f42 100644
--- a/app/src/main/res/layout/fragment_main4.xml
+++ b/app/src/main/res/layout/fragment_main4.xml
@@ -245,94 +245,6 @@
                         />
 
                 </LinearLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-
-
-                    android:background="@color/light" />
-                <LinearLayout
-                    android:id="@+id/ll_5"
-                    android:background="@color/white"
-                    android:layout_width="match_parent"
-                    android:orientation="horizontal"
-                    android:layout_height="50dp">
-                    <ImageView
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="16dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/icon_privacy"
-                        />
-                    <TextView
-
-                        android:layout_marginLeft="16dp"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
-                        android:textSize="16sp"
-                        android:textColor="#000"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:text="隐私政策"
-
-                        />
-                    <ImageView
-                        android:layout_marginRight="16dp"
-                        android:layout_gravity="center_vertical"
-                        android:layout_width="15dp"
-                        android:layout_height="15dp"
-                        android:src="@mipmap/returnme"
-
-                        />
-
-                </LinearLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-
-
-                    android:background="@color/light" />
-                <LinearLayout
-                    android:id="@+id/ll_6"
-                    android:background="@color/white"
-                    android:layout_width="match_parent"
-                    android:orientation="horizontal"
-                    android:layout_height="50dp">
-                    <ImageView
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginLeft="16dp"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@mipmap/icon_privacy"
-                        />
-                    <TextView
-
-                        android:layout_marginLeft="16dp"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical"
-                        android:textSize="16sp"
-                        android:textColor="#000"
-                        android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:text="用户协议"
-
-                        />
-                    <ImageView
-                        android:layout_marginRight="16dp"
-                        android:layout_gravity="center_vertical"
-                        android:layout_width="15dp"
-                        android:layout_height="15dp"
-                        android:src="@mipmap/returnme"
-
-                        />
-
-                </LinearLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-
-
-                    android:background="@color/light" />
 
                 <LinearLayout
                     android:visibility="gone"
diff --git a/app/src/main/res/layout/fragment_message.xml b/app/src/main/res/layout/fragment_message.xml
index be0a262..4967f05 100644
--- a/app/src/main/res/layout/fragment_message.xml
+++ b/app/src/main/res/layout/fragment_message.xml
@@ -39,7 +39,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/item_cart.xml b/app/src/main/res/layout/item_cart.xml
index 7fa6114..f21e32d 100644
--- a/app/src/main/res/layout/item_cart.xml
+++ b/app/src/main/res/layout/item_cart.xml
@@ -46,7 +46,7 @@
 
         </LinearLayout>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
             android:id="@+id/item_rec"
diff --git a/app/src/main/res/layout/item_discovery.xml b/app/src/main/res/layout/item_discovery.xml
index f243e7f..dc5bfe7 100644
--- a/app/src/main/res/layout/item_discovery.xml
+++ b/app/src/main/res/layout/item_discovery.xml
@@ -89,7 +89,7 @@
                 android:textStyle="bold"
                  />
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:paddingLeft="3dp"
                 android:id="@+id/rv_comment"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_order.xml b/app/src/main/res/layout/item_order.xml
index 155d88f..d65b8c1 100644
--- a/app/src/main/res/layout/item_order.xml
+++ b/app/src/main/res/layout/item_order.xml
@@ -46,7 +46,7 @@
 
         </LinearLayout>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/item_submit_order.xml b/app/src/main/res/layout/item_submit_order.xml
index 16baf41..6880adb 100644
--- a/app/src/main/res/layout/item_submit_order.xml
+++ b/app/src/main/res/layout/item_submit_order.xml
@@ -46,7 +46,7 @@
 
         </LinearLayout>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/kehumobanfragment.xml b/app/src/main/res/layout/kehumobanfragment.xml
index 3f504f3..1898011 100644
--- a/app/src/main/res/layout/kehumobanfragment.xml
+++ b/app/src/main/res/layout/kehumobanfragment.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical">
 
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/marking_fragment_recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/keymanagementitem.xml b/app/src/main/res/layout/keymanagementitem.xml
index 6f21986..0d55b9c 100644
--- a/app/src/main/res/layout/keymanagementitem.xml
+++ b/app/src/main/res/layout/keymanagementitem.xml
@@ -65,13 +65,13 @@
             android:layout_marginRight="15dip"
             android:background="@color/LightGray" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/door_card_revice"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1"
             android:background="@color/white">
 
-        </android.support.v7.widget.RecyclerView>
+        </androidx.recyclerview.widget.RecyclerView>
     </LinearLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_history_record.xml b/app/src/main/res/layout/layout_history_record.xml
index f8ee2e7..7f28cf8 100644
--- a/app/src/main/res/layout/layout_history_record.xml
+++ b/app/src/main/res/layout/layout_history_record.xml
@@ -40,7 +40,7 @@
 
         </RelativeLayout>
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/tb"
             android:visibility="gone"
             android:layout_width="match_parent"
@@ -52,13 +52,13 @@
             app:tabIndicatorFullWidth="false"
             app:tabTextColor="#000" />
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/fl"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/white">
 
-        </android.support.v4.view.ViewPager>
+        </androidx.viewpager.widget.ViewPager>
 
         <com.scwang.smartrefresh.layout.SmartRefreshLayout
             android:id="@+id/dw"
@@ -113,13 +113,13 @@
                         android:layout_height="match_parent">
 
 
-                        <android.support.v7.widget.RecyclerView
+                        <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/recy_view"
 
                             android:layout_width="match_parent"
                             android:layout_height="match_parent">
 
-                        </android.support.v7.widget.RecyclerView>
+                        </androidx.recyclerview.widget.RecyclerView>
 
 
                     </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_history_recordtwo.xml b/app/src/main/res/layout/layout_history_recordtwo.xml
index d3d238c..743b548 100644
--- a/app/src/main/res/layout/layout_history_recordtwo.xml
+++ b/app/src/main/res/layout/layout_history_recordtwo.xml
@@ -46,7 +46,7 @@
 
         </RelativeLayout>
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/tb"
             android:visibility="gone"
             android:layout_width="match_parent"
@@ -58,13 +58,13 @@
             app:tabIndicatorFullWidth="false"
             app:tabTextColor="#000" />
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/fl"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/white">
 
-        </android.support.v4.view.ViewPager>
+        </androidx.viewpager.widget.ViewPager>
 
         <com.scwang.smartrefresh.layout.SmartRefreshLayout
             android:id="@+id/dw"
@@ -119,13 +119,13 @@
                         android:layout_height="match_parent">
 
 
-                        <android.support.v7.widget.RecyclerView
+                        <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/recy_view"
 
                             android:layout_width="match_parent"
                             android:layout_height="match_parent">
 
-                        </android.support.v7.widget.RecyclerView>
+                        </androidx.recyclerview.widget.RecyclerView>
 
 
                     </RelativeLayout>
diff --git a/gradle.properties b/gradle.properties
index f15e569..86064fb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,3 +12,5 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 android.injected.testOnly=false
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/ninegridview/build.gradle b/ninegridview/build.gradle
index 2c25ff3..ea66f38 100644
--- a/ninegridview/build.gradle
+++ b/ninegridview/build.gradle
@@ -18,8 +18,8 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:27.1.1'
-    compile 'com.android.support:support-annotations:27.1.1'
+    compile 'androidx.appcompat:appcompat:1.0.0'
+    compile 'androidx.annotation:annotation:1.0.0'
     compile 'com.github.chrisbanes.photoview:library:1.2.4'
 
 
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridItemViewGroup.java b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridItemViewGroup.java
index c8f2d62..3d00471 100644
--- a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridItemViewGroup.java
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridItemViewGroup.java
@@ -1,8 +1,8 @@
 package com.lzy.ninegrid;
 
 import android.content.Context;
-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.LayoutInflater;
 import android.view.View;
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridView.java b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridView.java
index d7f3cfa..9284416 100644
--- a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridView.java
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridView.java
@@ -3,7 +3,7 @@ package com.lzy.ninegrid;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewWrapper.java b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewWrapper.java
index 1656060..c749493 100644
--- a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewWrapper.java
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewWrapper.java
@@ -8,10 +8,9 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.text.TextPaint;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.MotionEvent;
 import android.widget.ImageView;
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/preview/HackyViewPager.java b/ninegridview/src/main/java/com/lzy/ninegrid/preview/HackyViewPager.java
index d88409a..0fdf449 100644
--- a/ninegridview/src/main/java/com/lzy/ninegrid/preview/HackyViewPager.java
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/preview/HackyViewPager.java
@@ -1,7 +1,7 @@
 package com.lzy.ninegrid.preview;
 
 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/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewActivity.java b/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewActivity.java
index d143c9b..77126d1 100644
--- a/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewActivity.java
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewActivity.java
@@ -7,7 +7,7 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewTreeObserver;
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewAdapter.java b/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewAdapter.java
index 422dbfc..1d5f17e 100644
--- a/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewAdapter.java
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewAdapter.java
@@ -2,8 +2,8 @@ package com.lzy.ninegrid.preview;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
-import android.support.v4.view.PagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/preview/VideoPreviewActivity.java b/ninegridview/src/main/java/com/lzy/ninegrid/preview/VideoPreviewActivity.java
index c84c953..3c61600 100644
--- a/ninegridview/src/main/java/com/lzy/ninegrid/preview/VideoPreviewActivity.java
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/preview/VideoPreviewActivity.java
@@ -2,7 +2,7 @@ package com.lzy.ninegrid.preview;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.lzy.ninegrid.R;
 import com.pili.pldroid.player.widget.PLVideoView;
diff --git a/settings.gradle b/settings.gradle
index cb7838f..41d3094 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
 include ':app',':ninegridview'
+