diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 6764dbd..c126642 100755
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -300,6 +300,13 @@ public static final int *;
#ijkplayer
-keep class tv.danmaku.ijk.media.** {*;}
+#pictureSelecter
+-keep class com.luck.picture.lib.** { *; }
+-keep class com.luck.lib.camerax.** { *; }
+-dontwarn com.yalantis.ucrop**
+-keep class com.yalantis.ucrop** { *; }
+-keep interface com.yalantis.ucrop** { *; }
+
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6a2d795..affc826 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -45,6 +45,30 @@
<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+ <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
+ <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+ <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
+ <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+ <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+ <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+
+ <!--适配Android R包可见性 开始-->
+ <queries package="${applicationId}">
+ <intent>
+ <action android:name="android.media.action.IMAGE_CAPTURE">
+
+ </action>
+ </intent>
+ <intent>
+ <action android:name="android.media.action.ACTION_VIDEO_CAPTURE">
+
+ </action>
+ </intent>
+ </queries>
+ <!--适配Android R包可见性 结束-->
+
<application
android:name=".MyApplication"
android:allowBackup="true"
@@ -54,10 +78,13 @@
android:theme="@style/AppTheme"
android:resizeableActivity="false"
tools:ignore="GoogleAppIndexingWarning"
+ android:requestLegacyExternalStorage="true"
tools:replace="android:label,icon,theme,allowBackup">
+
+
<provider
- android:name="android.support.v4.content.FileProvider"
+ android:name="androidx.core.content.FileProvider"
android:authorities="com.dayu.bigfish.fileProvider"
android:exported="false"
android:grantUriPermissions="true">
diff --git a/app/src/main/java/com/dayu/bigfish/InitializeActivity.java b/app/src/main/java/com/dayu/bigfish/InitializeActivity.java
index 6e02f95..b3fe1e7 100755
--- a/app/src/main/java/com/dayu/bigfish/InitializeActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/InitializeActivity.java
@@ -6,9 +6,10 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
-import android.support.annotation.NonNull;
import android.widget.Toast;
+import androidx.annotation.NonNull;
+
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.bigfish.databinding.ActivityInitializeMainBinding;
import com.dayu.bigfish.ui.MainActivity;
diff --git a/app/src/main/java/com/dayu/bigfish/MyApplication.java b/app/src/main/java/com/dayu/bigfish/MyApplication.java
index b048fea..df9d11e 100755
--- a/app/src/main/java/com/dayu/bigfish/MyApplication.java
+++ b/app/src/main/java/com/dayu/bigfish/MyApplication.java
@@ -9,14 +9,12 @@ import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
import android.os.Build;
import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.util.Log;
+
+import androidx.annotation.NonNull;
import com.dayu.bigfish.ui.service.LocationService;
import com.dayu.common.BaseApplication;
import com.dayu.event.AppReturnFrontEvent;
-import com.dayu.livemodule.LiveUtils;
-import com.dayu.location.base.LocationUtils;
import com.dayu.order.greendao.GreenDaoManager;
import com.dayu.utils.NetworkConnectChangedReceiver;
import com.dayu.utils.SPUtils;
diff --git a/app/src/main/java/com/dayu/bigfish/MyProvider.java b/app/src/main/java/com/dayu/bigfish/MyProvider.java
index 8c96865..5f93bef 100644
--- a/app/src/main/java/com/dayu/bigfish/MyProvider.java
+++ b/app/src/main/java/com/dayu/bigfish/MyProvider.java
@@ -1,6 +1,7 @@
package com.dayu.bigfish;
-import android.support.v4.content.FileProvider;
+
+import androidx.core.content.FileProvider;
public class MyProvider extends FileProvider {
}
diff --git a/app/src/main/java/com/dayu/bigfish/SplashActivity.java b/app/src/main/java/com/dayu/bigfish/SplashActivity.java
index 0f6cbc5..b859975 100755
--- a/app/src/main/java/com/dayu/bigfish/SplashActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/SplashActivity.java
@@ -2,7 +2,8 @@ package com.dayu.bigfish;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
public class SplashActivity extends AppCompatActivity {
diff --git a/app/src/main/java/com/dayu/bigfish/ui/MainActivity.java b/app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
index 5c1358f..46a49f2 100644
--- a/app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
@@ -11,15 +11,16 @@ import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.provider.Settings;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.app.NotificationCompat;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
import android.widget.TextView;
+import androidx.core.app.NotificationCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.amap.api.location.AMapLocation;
diff --git a/app/src/main/java/com/dayu/bigfish/ui/ManagerActivity.java b/app/src/main/java/com/dayu/bigfish/ui/ManagerActivity.java
index a1cf419..4102808 100644
--- a/app/src/main/java/com/dayu/bigfish/ui/ManagerActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/ManagerActivity.java
@@ -1,13 +1,14 @@
package com.dayu.bigfish.ui;
import android.content.Intent;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.View;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
import com.alibaba.android.arouter.facade.annotation.Route;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.bigfish.R;
diff --git a/app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java b/app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
index 7949d58..52b4352 100755
--- a/app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
@@ -4,9 +4,10 @@ import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.content.Context;
import android.os.Environment;
-import android.support.v4.app.NotificationCompat;
import android.view.View;
+import androidx.core.app.NotificationCompat;
+
import com.alibaba.android.arouter.facade.annotation.Route;
import com.dayu.base.api.Api;
import com.dayu.base.api.DownloadService;
diff --git a/app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java b/app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
index ead60b7..463091a 100644
--- a/app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/service/LocationService.java
@@ -9,7 +9,8 @@ import android.os.Build;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
import com.dayu.bigfish.api.ApiFactory;
import com.dayu.common.Constants;
diff --git a/app/src/main/java/com/dayu/bigfish/ui/views/TitleBar.java b/app/src/main/java/com/dayu/bigfish/ui/views/TitleBar.java
index 524c1fc..aa685d9 100644
--- a/app/src/main/java/com/dayu/bigfish/ui/views/TitleBar.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/views/TitleBar.java
@@ -3,13 +3,14 @@ package com.dayu.bigfish.ui.views;
import android.app.Activity;
import android.content.Context;
import android.content.res.TypedArray;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import com.dayu.bigfish.R;
/**
diff --git a/app/src/main/res/layout/activity_initialize_main.xml b/app/src/main/res/layout/activity_initialize_main.xml
index 3c80385..9ff2743 100755
--- a/app/src/main/res/layout/activity_initialize_main.xml
+++ b/app/src/main/res/layout/activity_initialize_main.xml
@@ -8,7 +8,7 @@
android:layout_height="match_parent"
android:background="@color/transparent">
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/vp_initial"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/activity_logout.xml b/app/src/main/res/layout/activity_logout.xml
index 09a3e13..aa18a6b 100644
--- a/app/src/main/res/layout/activity_logout.xml
+++ b/app/src/main/res/layout/activity_logout.xml
@@ -7,7 +7,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -19,7 +19,7 @@
android:id="@+id/tv_title"
android:text="注销账号"
style="@style/toolbar_title" />
- </android.support.v7.widget.Toolbar>
+ </androidx.appcompat.widget.Toolbar>
<TextView
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index cf543b5..ef3388c 100755
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -14,7 +14,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -25,7 +25,7 @@
<TextView
android:id="@+id/tv_title"
style="@style/toolbar_title" />
- </android.support.v7.widget.Toolbar>
+ </androidx.appcompat.widget.Toolbar>
<LinearLayout
android:layout_width="match_parent"
diff --git a/baseSDK/build.gradle b/baseSDK/build.gradle
index e33c2cd..8a8ebc5 100644
--- a/baseSDK/build.gradle
+++ b/baseSDK/build.gradle
@@ -46,7 +46,7 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
testImplementation 'junit:junit:4.12'
- api 'com.android.support:design:27.1.1'
+ api 'com.google.android.material:material:1.2.0-alpha06'
//mutidex
api 'com.android.support:multidex:1.0.3'
//eventBus
@@ -57,7 +57,10 @@ dependencies {
api 'com.squareup.retrofit2:adapter-rxjava2:2.8.1'
//图片选择
// api 'com.github.LuckSiege.PictureSelector:picture_library:v2.1.5'
- api 'io.github.lucksiege:pictureselector:v2.1.9'
+// api 'io.github.lucksiege:pictureselector:v2.1.9'
+ api 'io.github.lucksiege:pictureselector:v3.11.1'
+ // uCrop library (Not necessary)
+ api 'io.github.lucksiege:ucrop:v3.11.1'
//ARouter
api "com.alibaba:arouter-api:$arouter_api_version"
//greendao数据库
@@ -105,4 +108,7 @@ dependencies {
implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.7.9'//微信官方依赖库，必选
api project(':camera')
+
+ api 'com.github.bumptech.glide:glide:4.5.0'
+ api 'io.reactivex.rxjava2:rxandroid:2.0.1'
}
diff --git a/baseSDK/src/main/java/com/dayu/base/api/Api.java b/baseSDK/src/main/java/com/dayu/base/api/Api.java
index 8fc752d..3feacd0 100755
--- a/baseSDK/src/main/java/com/dayu/base/api/Api.java
+++ b/baseSDK/src/main/java/com/dayu/base/api/Api.java
@@ -1,9 +1,10 @@
package com.dayu.base.api;
import android.os.Build;
-import android.support.annotation.NonNull;
import android.text.TextUtils;
+import androidx.annotation.NonNull;
+
import com.dayu.base.api.protocol.BaseResponse;
import com.dayu.common.BaseConstant;
import com.dayu.common.Constants;
diff --git a/baseSDK/src/main/java/com/dayu/base/api/BaseApiFactory.java b/baseSDK/src/main/java/com/dayu/base/api/BaseApiFactory.java
index 08d70ec..43325d3 100644
--- a/baseSDK/src/main/java/com/dayu/base/api/BaseApiFactory.java
+++ b/baseSDK/src/main/java/com/dayu/base/api/BaseApiFactory.java
@@ -1,5 +1,7 @@
package com.dayu.base.api;
+import android.util.Log;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -44,7 +46,13 @@ public class BaseApiFactory {
ArrayList<File> files = new ArrayList<>();
if (imageUrl != null && imageUrl.size() > 0) {
for (int i = 0; i < imageUrl.size(); i++) {
- files.add(new File(imageUrl.get(i)));
+ File file = new File(imageUrl.get(i));
+ if (file.exists()){
+ Log.e("TAG", "packPhoto: 存在");
+ }else{
+ Log.e("TAG", "packPhoto: 不存在");
+ }
+ files.add(file);
}
}
MultipartBody.Part[] part = new MultipartBody.Part[files.size()];
diff --git a/baseSDK/src/main/java/com/dayu/base/api/DownloadService.java b/baseSDK/src/main/java/com/dayu/base/api/DownloadService.java
index 279d0f6..5ea1546 100755
--- a/baseSDK/src/main/java/com/dayu/base/api/DownloadService.java
+++ b/baseSDK/src/main/java/com/dayu/base/api/DownloadService.java
@@ -4,7 +4,8 @@ import android.app.IntentService;
import android.app.NotificationManager;
import android.content.Context;
import android.content.Intent;
-import android.support.v4.app.NotificationCompat;
+
+import androidx.core.app.NotificationCompat;
import com.dayu.utils.DownloadManager;
import com.dayu.widgets.listener.onDownloadListener;
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/activity/BaseActivity.java b/baseSDK/src/main/java/com/dayu/base/ui/activity/BaseActivity.java
index 4a3bc3e..e137659 100755
--- a/baseSDK/src/main/java/com/dayu/base/ui/activity/BaseActivity.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/activity/BaseActivity.java
@@ -4,10 +4,10 @@ import android.annotation.TargetApi;
import android.app.NotificationManager;
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.NotificationCompat;
import android.text.TextUtils;
+import androidx.annotation.NonNull;
+import androidx.core.app.NotificationCompat;
import androidx.databinding.ViewDataBinding;
import com.alibaba.android.arouter.launcher.ARouter;
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/activity/CameraActivity.java b/baseSDK/src/main/java/com/dayu/base/ui/activity/CameraActivity.java
index cbdc59d..4e33d76 100644
--- a/baseSDK/src/main/java/com/dayu/base/ui/activity/CameraActivity.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/activity/CameraActivity.java
@@ -7,12 +7,13 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
-import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.View;
import android.view.WindowManager;
import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.cjt2325.cameralibrary.JCameraView;
import com.cjt2325.cameralibrary.listener.ClickListener;
import com.cjt2325.cameralibrary.listener.ErrorListener;
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/activity/DataBindingActivity.java b/baseSDK/src/main/java/com/dayu/base/ui/activity/DataBindingActivity.java
index 434bbeb..165a545 100755
--- a/baseSDK/src/main/java/com/dayu/base/ui/activity/DataBindingActivity.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/activity/DataBindingActivity.java
@@ -4,9 +4,9 @@ import android.app.Activity;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
import android.view.View;
+import androidx.appcompat.app.AppCompatActivity;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/activity/DocWebviewActivity.java b/baseSDK/src/main/java/com/dayu/base/ui/activity/DocWebviewActivity.java
index 57335ad..3430b39 100644
--- a/baseSDK/src/main/java/com/dayu/base/ui/activity/DocWebviewActivity.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/activity/DocWebviewActivity.java
@@ -2,10 +2,11 @@ package com.dayu.base.ui.activity;
import android.graphics.Bitmap;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.dayu.baselibrary.R;
import com.dayu.common.Constants;
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/activity/ImgGalleryActivty.java b/baseSDK/src/main/java/com/dayu/base/ui/activity/ImgGalleryActivty.java
index 1d7a135..e2e00a2 100644
--- a/baseSDK/src/main/java/com/dayu/base/ui/activity/ImgGalleryActivty.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/activity/ImgGalleryActivty.java
@@ -3,14 +3,15 @@ package com.dayu.base.ui.activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
@@ -20,7 +21,7 @@ import com.github.chrisbanes.photoview.PhotoView;
import java.util.ArrayList;
import java.util.List;
-public class ImgGalleryActivty extends AppCompatActivity{
+public class ImgGalleryActivty extends AppCompatActivity {
ArrayList<String> imgList;
int selectIndex;
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/activity/PreviewActivty.java b/baseSDK/src/main/java/com/dayu/base/ui/activity/PreviewActivty.java
index 18f2966..b938780 100755
--- a/baseSDK/src/main/java/com/dayu/base/ui/activity/PreviewActivty.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/activity/PreviewActivty.java
@@ -1,11 +1,12 @@
package com.dayu.base.ui.activity;
import android.content.Context;
-import android.support.v4.view.PagerAdapter;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
+import androidx.viewpager.widget.PagerAdapter;
+
import com.dayu.baselibrary.R;
import com.dayu.baselibrary.databinding.AcitivityPreviewBinding;
import com.dayu.common.Constants;
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/activity/VideoPreviewActivty.java b/baseSDK/src/main/java/com/dayu/base/ui/activity/VideoPreviewActivty.java
index c53409d..03f60ec 100644
--- a/baseSDK/src/main/java/com/dayu/base/ui/activity/VideoPreviewActivty.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/activity/VideoPreviewActivty.java
@@ -1,10 +1,11 @@
package com.dayu.base.ui.activity;
import android.content.Context;
-import android.support.v4.view.PagerAdapter;
import android.view.View;
import android.view.ViewGroup;
+import androidx.viewpager.widget.PagerAdapter;
+
import com.dayu.baselibrary.R;
import com.dayu.baselibrary.databinding.AcitivityPreviewBinding;
import com.dayu.common.Constants;
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/adapter/BaseViewHolder.java b/baseSDK/src/main/java/com/dayu/base/ui/adapter/BaseViewHolder.java
index d8c524d..03fd056 100755
--- a/baseSDK/src/main/java/com/dayu/base/ui/adapter/BaseViewHolder.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/adapter/BaseViewHolder.java
@@ -1,8 +1,8 @@
package com.dayu.base.ui.adapter;
-import android.support.v7.widget.RecyclerView;
import androidx.databinding.ViewDataBinding;
+import androidx.recyclerview.widget.RecyclerView;
/**
* Created by luofan on 2017/12/9.
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/adapter/CoreAdapter.java b/baseSDK/src/main/java/com/dayu/base/ui/adapter/CoreAdapter.java
index 2e33d5b..bdbe6b5 100755
--- a/baseSDK/src/main/java/com/dayu/base/ui/adapter/CoreAdapter.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/adapter/CoreAdapter.java
@@ -2,13 +2,13 @@ package com.dayu.base.ui.adapter;
import android.animation.ObjectAnimator;
import android.content.Context;
-import android.support.annotation.LayoutRes;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.LayoutRes;
import androidx.databinding.DataBindingUtil;
+import androidx.recyclerview.widget.RecyclerView;
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.base.ui.presenter.BaseListPresenter;
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/adapter/FragmentAdapter.java b/baseSDK/src/main/java/com/dayu/base/ui/adapter/FragmentAdapter.java
index f826be6..49e720d 100755
--- a/baseSDK/src/main/java/com/dayu/base/ui/adapter/FragmentAdapter.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/adapter/FragmentAdapter.java
@@ -1,10 +1,11 @@
package com.dayu.base.ui.adapter;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+
import java.util.List;
/**
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/adapter/FragmentBaseAdapter.java b/baseSDK/src/main/java/com/dayu/base/ui/adapter/FragmentBaseAdapter.java
index 874b922..6613690 100755
--- a/baseSDK/src/main/java/com/dayu/base/ui/adapter/FragmentBaseAdapter.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/adapter/FragmentBaseAdapter.java
@@ -1,8 +1,9 @@
package com.dayu.base.ui.adapter;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
import java.util.List;
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/adapter/MediaChooseAdapter.java b/baseSDK/src/main/java/com/dayu/base/ui/adapter/MediaChooseAdapter.java
index 974caad..80739ed 100644
--- a/baseSDK/src/main/java/com/dayu/base/ui/adapter/MediaChooseAdapter.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/adapter/MediaChooseAdapter.java
@@ -5,26 +5,29 @@ import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Intent;
import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RelativeLayout;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.dayu.base.ui.activity.ImgGalleryActivty;
import com.dayu.base.ui.activity.VideoPreviewActivty;
import com.dayu.baselibrary.R;
import com.dayu.common.Constants;
+import com.dayu.utils.GlideEngine;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.MPermissionUtils;
import com.dayu.utils.UtilsScreen;
import com.dayu.widgets.listener.OnItemClickListener;
-import com.luck.picture.lib.PictureSelectionModel;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelectionModel;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
-import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.config.SelectMimeType;
+import com.luck.picture.lib.config.SelectModeConfig;
import java.io.File;
import java.util.ArrayList;
@@ -35,7 +38,7 @@ public class MediaChooseAdapter extends RecyclerView.Adapter<MediaChooseAdapter.
private Activity context;
private ArrayList<String> list = new ArrayList<>();
private int maxCount = 1;
- private int mimeType = PictureMimeType.ofVideo();
+ private int mimeType = SelectMimeType.ofVideo();
private int videoLength = 30;
private int requestCode = PictureConfig.CHOOSE_REQUEST;
private OnItemClickListener<MediaChooseAdapter.Holder, Integer> listener;
@@ -215,23 +218,41 @@ public class MediaChooseAdapter extends RecyclerView.Adapter<MediaChooseAdapter.
size = maxCount + 1 - list.size();
PictureSelectionModel selector = PictureSelector.create(context)
.openGallery(mimeType)//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
- .maxSelectNum(size)// 最大图片选择数量 int
- .imageSpanCount(4)// 每行显示个数 int
- .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
- .previewImage(true)// 是否可预览图片 true or false
- .isCamera(showCamera)// 是否显示拍照按钮 true or false
- .recordVideoSecond(videoLength)
- .videoMaxSecond(videoLength)
- .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
- .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
- .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
- .compress(true)// 是否压缩 true or false
- .glideOverride(300, 500)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
- .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
- .compressSavePath(getPath())//压缩图片保存地址
- .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
- .minimumCompressSize(Constants.MINIMUM_COMPRESSSIZE)// 小于100kb的图片不压缩
- .synOrAsy(true);//同步true或异步false 压缩 默认同步、
+ .setImageEngine(GlideEngine.createGlideEngine())
+// .setCropEngine(new ImageFileCropEngine())
+// .setFilterMaxFileSize(size)
+// .maxSelectNum(size)// 最大图片选择数量 int
+ .setImageSpanCount(4)
+ .setMaxSelectNum(size)
+// .imageSpanCount(4)// 每行显示个数 int
+ .setSelectionMode(SelectModeConfig.MULTIPLE);
+// .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
+// .isPreviewImage(true)
+// .previewImage(true)// 是否可预览图片 true or false
+// .isDisplayCamera(showCamera)
+// .isCamera(showCamera)// 是否显示拍照按钮 true or false
+// .setRecordVideoMaxSecond(videoLength)
+// .recordVideoSecond(videoLength)
+// .setFilterVideoMaxSecond(videoLength)
+// .videoMaxSecond(videoLength)
+// .isSelectZoomAnim(true)
+// .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
+
+// .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
+// .setOutputCameraDir("/CustomPath");
+// .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
+
+// .compress(true)// 是否压缩 true or false
+
+// .glideOverride(300, 500)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
+
+// .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
+
+// .compressSavePath(getPath())//压缩图片保存地址
+
+// .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
+// .minimumCompressSize(Constants.MINIMUM_COMPRESSSIZE)// 小于100kb的图片不压缩
+// .synOrAsy(true);//同步true或异步false 压缩 默认同步、
// .enableCrop(true)//是否裁剪
// .freeStyleCropEnabled(true)
selector.forResult(requestCode);
@@ -247,7 +268,7 @@ public class MediaChooseAdapter extends RecyclerView.Adapter<MediaChooseAdapter.
}
private void dumpPic(ArrayList<String> list, int position) {
- if (mimeType == PictureMimeType.ofVideo()) {
+ if (mimeType == SelectMimeType.ofVideo()) {
Intent intent = new Intent(context, VideoPreviewActivty.class);
intent.putStringArrayListExtra(Constants.BUNDLE_KEY_ID, list);
context.startActivity(intent);
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/adapter/PhotoViewAdapter.java b/baseSDK/src/main/java/com/dayu/base/ui/adapter/PhotoViewAdapter.java
index 6239fa2..c9f47d7 100644
--- a/baseSDK/src/main/java/com/dayu/base/ui/adapter/PhotoViewAdapter.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/adapter/PhotoViewAdapter.java
@@ -4,25 +4,28 @@ import android.Manifest;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RelativeLayout;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.dayu.base.ui.activity.ImgGalleryActivty;
import com.dayu.baselibrary.R;
-import com.dayu.common.Constants;
+import com.dayu.utils.GlideEngine;
import com.dayu.utils.GlideImageLoader;
+import com.dayu.utils.ImageFileCropEngine;
import com.dayu.utils.MPermissionUtils;
import com.dayu.utils.UtilsScreen;
import com.dayu.widgets.listener.OnItemClickListener;
-import com.luck.picture.lib.PictureSelectionModel;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelectionModel;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
-import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.config.SelectMimeType;
+import com.luck.picture.lib.config.SelectModeConfig;
import java.io.File;
import java.util.ArrayList;
@@ -156,24 +159,36 @@ public class PhotoViewAdapter extends RecyclerView.Adapter<PhotoViewAdapter.Hold
int size;
size = maxCount+1 - list.size();
PictureSelectionModel selector = PictureSelector.create(context)
- .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
- .maxSelectNum(size)// 最大图片选择数量 int
- .imageSpanCount(4)// 每行显示个数 int
- .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
- .previewImage(true)// 是否可预览图片 true or false
- .isCamera(true)// 是否显示拍照按钮 true or false
- .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
- .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
- .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
- .compress(true)// 是否压缩 true or false
- .glideOverride(300, 500)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
- .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
- .compressSavePath(getPath())//压缩图片保存地址
- .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
- .minimumCompressSize(Constants.MINIMUM_COMPRESSSIZE)// 小于**kb的图片不压缩
- .synOrAsy(true);//同步true或异步false 压缩 默认同步、
-// .enableCrop(true)//是否裁剪
-// .freeStyleCropEnabled(true)
+ .openGallery(SelectMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+ .setImageEngine(GlideEngine.createGlideEngine())
+ .setCropEngine(new ImageFileCropEngine())
+// .setFilterMaxFileSize(size)
+ .setImageSpanCount(4)
+ .setSelectionMode(SelectModeConfig.MULTIPLE)
+ .isPreviewImage(true)
+ .isDisplayCamera(true)
+ .isSelectZoomAnim(true)
+ .setOutputCameraDir("/CustomPath");
+
+// PictureSelectionModel selector = PictureSelector.create(context)
+// .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+// .maxSelectNum(size)// 最大图片选择数量 int
+// .imageSpanCount(4)// 每行显示个数 int
+// .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
+// .previewImage(true)// 是否可预览图片 true or false
+// .isCamera(true)// 是否显示拍照按钮 true or false
+// .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
+// .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
+// .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
+// .compress(true)// 是否压缩 true or false
+// .glideOverride(300, 500)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
+// .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
+// .compressSavePath(getPath())//压缩图片保存地址
+// .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
+// .minimumCompressSize(Constants.MINIMUM_COMPRESSSIZE)// 小于**kb的图片不压缩
+// .synOrAsy(true);//同步true或异步false 压缩 默认同步、
+//// .enableCrop(true)//是否裁剪
+//// .freeStyleCropEnabled(true)
selector.forResult(PictureConfig.CHOOSE_REQUEST);
}
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/adapter/SpacesItemDecoration.java b/baseSDK/src/main/java/com/dayu/base/ui/adapter/SpacesItemDecoration.java
index f6afcb5..d2405f6 100644
--- a/baseSDK/src/main/java/com/dayu/base/ui/adapter/SpacesItemDecoration.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/adapter/SpacesItemDecoration.java
@@ -1,9 +1,10 @@
package com.dayu.base.ui.adapter;
import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
import android.view.View;
+import androidx.recyclerview.widget.RecyclerView;
+
/**
* Created by luofan
* on 2018/11/30.
diff --git a/baseSDK/src/main/java/com/dayu/base/ui/fragment/DataBindingFragment.java b/baseSDK/src/main/java/com/dayu/base/ui/fragment/DataBindingFragment.java
index 6f5046b..acc3bc5 100755
--- a/baseSDK/src/main/java/com/dayu/base/ui/fragment/DataBindingFragment.java
+++ b/baseSDK/src/main/java/com/dayu/base/ui/fragment/DataBindingFragment.java
@@ -4,14 +4,14 @@ import android.app.Activity;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.Nullable;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
+import androidx.fragment.app.Fragment;
import com.dayu.utils.LogUtils;
diff --git a/baseSDK/src/main/java/com/dayu/common/BaseApplication.java b/baseSDK/src/main/java/com/dayu/common/BaseApplication.java
index 1dce828..7424981 100644
--- a/baseSDK/src/main/java/com/dayu/common/BaseApplication.java
+++ b/baseSDK/src/main/java/com/dayu/common/BaseApplication.java
@@ -4,8 +4,9 @@ import android.app.Activity;
import android.app.Application;
import android.content.Context;
import android.os.Bundle;
-import android.support.multidex.MultiDex;
-import android.support.multidex.MultiDexApplication;
+
+import androidx.multidex.MultiDex;
+import androidx.multidex.MultiDexApplication;
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.utils.AppManager;
diff --git a/baseSDK/src/main/java/com/dayu/common/BaseView.java b/baseSDK/src/main/java/com/dayu/common/BaseView.java
index b51c0fe..af53dea 100755
--- a/baseSDK/src/main/java/com/dayu/common/BaseView.java
+++ b/baseSDK/src/main/java/com/dayu/common/BaseView.java
@@ -2,7 +2,8 @@ package com.dayu.common;
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.StringRes;
+
+import androidx.annotation.StringRes;
/**
* Created by luofan on 17/11/02.
diff --git a/baseSDK/src/main/java/com/dayu/utils/AppUtils.java b/baseSDK/src/main/java/com/dayu/utils/AppUtils.java
index f11e2d0..e4724e8 100644
--- a/baseSDK/src/main/java/com/dayu/utils/AppUtils.java
+++ b/baseSDK/src/main/java/com/dayu/utils/AppUtils.java
@@ -10,9 +10,10 @@ import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
-import android.support.v4.content.FileProvider;
import android.telephony.TelephonyManager;
+import androidx.core.content.FileProvider;
+
import com.cjt2325.cameralibrary.util.LogUtil;
import com.dayu.baselibrary.R;
import com.dayu.common.BaseApplication;
diff --git a/baseSDK/src/main/java/com/dayu/utils/BannerImgLoader.java b/baseSDK/src/main/java/com/dayu/utils/BannerImgLoader.java
index b611013..8ab6aaa 100644
--- a/baseSDK/src/main/java/com/dayu/utils/BannerImgLoader.java
+++ b/baseSDK/src/main/java/com/dayu/utils/BannerImgLoader.java
@@ -10,7 +10,6 @@ import com.bumptech.glide.request.RequestOptions;
import com.bumptech.glide.request.target.SimpleTarget;
import com.dayu.baselibrary.R;
import com.dayu.common.BaseApplication;
-import com.luck.picture.lib.tools.Constant;
import com.youth.banner.loader.ImageLoader;
diff --git a/baseSDK/src/main/java/com/dayu/utils/CommonUtils.java b/baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
index 19138af..b71fb9e 100644
--- a/baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
+++ b/baseSDK/src/main/java/com/dayu/utils/CommonUtils.java
@@ -50,8 +50,11 @@ public class CommonUtils {
* @param activity
*/
public static void hideSoftInput(Activity activity) {
- ((InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow
- (activity.getCurrentFocus().getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+ View currentFocus = activity.getCurrentFocus();
+ if (currentFocus != null){
+ InputMethodManager systemService = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+ systemService.hideSoftInputFromWindow(currentFocus.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
+ }
}
diff --git a/baseSDK/src/main/java/com/dayu/utils/GlideEngine.java b/baseSDK/src/main/java/com/dayu/utils/GlideEngine.java
new file mode 100644
index 0000000..49f907a
--- /dev/null
+++ b/baseSDK/src/main/java/com/dayu/utils/GlideEngine.java
@@ -0,0 +1,114 @@
+package com.dayu.utils;
+
+import android.content.Context;
+import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+import com.luck.picture.lib.engine.ImageEngine;
+import com.luck.picture.lib.utils.ActivityCompatHelper;
+
+/**
+ * @author：luck
+ * @date：2019-11-13 17:02
+ * @describe：Glide加载引擎
+ */
+public class GlideEngine implements ImageEngine {
+
+ /**
+ * 加载图片
+ *
+ * @param context 上下文
+ * @param url 资源url
+ * @param imageView 图片承载控件
+ */
+ @Override
+ public void loadImage(Context context, String url, ImageView imageView) {
+ if (!ActivityCompatHelper.assertValidRequest(context)) {
+ return;
+ }
+ Glide.with(context)
+ .load(url)
+ .into(imageView);
+ }
+
+ @Override
+ public void loadImage(Context context, ImageView imageView, String url, int maxWidth, int maxHeight) {
+ if (!ActivityCompatHelper.assertValidRequest(context)) {
+ return;
+ }
+ Glide.with(context)
+ .load(url)
+// .override(maxWidth, maxHeight)
+ .into(imageView);
+ }
+
+ /**
+ * 加载相册目录封面
+ *
+ * @param context 上下文
+ * @param url 图片路径
+ * @param imageView 承载图片ImageView
+ */
+ @Override
+ public void loadAlbumCover(Context context, String url, ImageView imageView) {
+ if (!ActivityCompatHelper.assertValidRequest(context)) {
+ return;
+ }
+ Glide.with(context)
+ .asBitmap()
+ .load(url)
+// .override(180, 180)
+// .sizeMultiplier(0.5f)
+// .transform(new CenterCrop(), new RoundedCorners(8))
+// .placeholder(R.drawable.ps_image_placeholder)
+ .into(imageView);
+ }
+
+
+ /**
+ * 加载图片列表图片
+ *
+ * @param context 上下文
+ * @param url 图片路径
+ * @param imageView 承载图片ImageView
+ */
+ @Override
+ public void loadGridImage(Context context, String url, ImageView imageView) {
+ if (!ActivityCompatHelper.assertValidRequest(context)) {
+ return;
+ }
+ Glide.with(context)
+ .load(url)
+// .override(200, 200)
+// .centerCrop()
+// .placeholder(R.drawable.ps_image_placeholder)
+ .into(imageView);
+ }
+
+ @Override
+ public void pauseRequests(Context context) {
+ if (!ActivityCompatHelper.assertValidRequest(context)) {
+ return;
+ }
+ Glide.with(context).pauseRequests();
+ }
+
+ @Override
+ public void resumeRequests(Context context) {
+ if (!ActivityCompatHelper.assertValidRequest(context)) {
+ return;
+ }
+ Glide.with(context).resumeRequests();
+ }
+
+ private GlideEngine() {
+ }
+
+ private static final class InstanceHolder {
+ static final GlideEngine instance = new GlideEngine();
+ }
+
+ public static GlideEngine createGlideEngine() {
+ return InstanceHolder.instance;
+ }
+}
diff --git a/baseSDK/src/main/java/com/dayu/utils/GlideImageLoader.java b/baseSDK/src/main/java/com/dayu/utils/GlideImageLoader.java
index 3c4924f..4eeb9dc 100755
--- a/baseSDK/src/main/java/com/dayu/utils/GlideImageLoader.java
+++ b/baseSDK/src/main/java/com/dayu/utils/GlideImageLoader.java
@@ -7,9 +7,10 @@ import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
import android.os.Environment;
-import android.support.annotation.DrawableRes;
import android.widget.ImageView;
+import androidx.annotation.DrawableRes;
+
import com.bumptech.glide.Glide;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
import com.bumptech.glide.request.RequestOptions;
diff --git a/baseSDK/src/main/java/com/dayu/utils/GlideRoundTransform.java b/baseSDK/src/main/java/com/dayu/utils/GlideRoundTransform.java
index 87c8cf8..5cf01b5 100644
--- a/baseSDK/src/main/java/com/dayu/utils/GlideRoundTransform.java
+++ b/baseSDK/src/main/java/com/dayu/utils/GlideRoundTransform.java
@@ -26,7 +26,7 @@ public class GlideRoundTransform extends BitmapTransformation {
}
public GlideRoundTransform(Context context, int dp) {
- super(context);
+ super();
this.radius = Resources.getSystem().getDisplayMetrics().density * dp;
}
diff --git a/baseSDK/src/main/java/com/dayu/utils/ImageFileCropEngine.java b/baseSDK/src/main/java/com/dayu/utils/ImageFileCropEngine.java
new file mode 100644
index 0000000..3f81c84
--- /dev/null
+++ b/baseSDK/src/main/java/com/dayu/utils/ImageFileCropEngine.java
@@ -0,0 +1,81 @@
+package com.dayu.utils;
+
+import android.net.Uri;
+
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+
+import com.dayu.baselibrary.R;
+import com.luck.picture.lib.engine.CropFileEngine;
+import com.yalantis.ucrop.UCrop;
+
+import java.util.ArrayList;
+
+/**
+ * 自定义裁剪
+ */
+public class ImageFileCropEngine implements CropFileEngine {
+
+ @Override
+ public void onStartCrop(Fragment fragment, Uri srcUri, Uri destinationUri, ArrayList<String> dataSource, int requestCode) {
+ UCrop.Options options = buildOptions(fragment);
+ UCrop uCrop = UCrop.of(srcUri, destinationUri, dataSource);
+
+
+ options.withAspectRatio(1, 1);
+ options.setHideBottomControls(true);
+
+ options.setCropOutputPathDir(fragment.requireActivity().getFilesDir().getAbsolutePath()
+ + "/"+"crop/");
+ options.setCropOutputFileName(System.currentTimeMillis() + ".png");
+ options.isDarkStatusBarBlack(true);
+ uCrop.withOptions(options);
+
+
+ uCrop.start(fragment.requireActivity(), fragment, requestCode);
+ }
+
+ private UCrop.Options buildOptions(Fragment fragment) {
+ UCrop.Options options = new UCrop.Options();
+// options.setHideBottomControls(!cb_hide.isChecked());
+// options.setFreeStyleCropEnabled(cb_styleCrop.isChecked());
+// options.setShowCropFrame(cb_showCropFrame.isChecked());
+// options.setShowCropGrid(cb_showCropGrid.isChecked());
+// options.setCircleDimmedLayer(cb_crop_circular.isChecked());
+ options.withAspectRatio(1, 1);
+ options.setHideBottomControls(true);
+// options.setCropOutputPathDir(getApplication().getFilesDir().getAbsolutePath() + "/wkCrop");
+// options.setCropOutputFileName(System.currentTimeMillis() + ".png");
+ options.setStatusBarColor(ContextCompat.getColor(fragment.getContext(), R.color.white));
+ options.isDarkStatusBarBlack(true);
+// options.isCropDragSmoothToCenter(false);
+// options.setSkipCropMimeType(getNotSupportCrop());
+// options.isForbidCropGifWebp(cb_not_gif.isChecked());
+// options.isForbidSkipMultipleCrop(true);
+// options.setMaxScaleMultiplier(100);
+// if (selectorStyle != null && selectorStyle.getSelectMainStyle().getStatusBarColor() != 0) {
+// SelectMainStyle mainStyle = selectorStyle.getSelectMainStyle();
+// boolean isDarkStatusBarBlack = mainStyle.isDarkStatusBarBlack();
+// int statusBarColor = mainStyle.getStatusBarColor();
+// options.isDarkStatusBarBlack(isDarkStatusBarBlack);
+// if (StyleUtils.checkStyleValidity(statusBarColor)) {
+// options.setStatusBarColor(statusBarColor);
+// options.setToolbarColor(statusBarColor);
+// } else {
+// options.setStatusBarColor(ContextCompat.getColor(getContext(), R.color.ps_color_grey));
+// options.setToolbarColor(ContextCompat.getColor(getContext(), R.color.ps_color_grey));
+// }
+// TitleBarStyle titleBarStyle = selectorStyle.getTitleBarStyle();
+// if (StyleUtils.checkStyleValidity(titleBarStyle.getTitleTextColor())) {
+// options.setToolbarWidgetColor(titleBarStyle.getTitleTextColor());
+// } else {
+// options.setToolbarWidgetColor(ContextCompat.getColor(getContext(), R.color.ps_color_white));
+// }
+// } else {
+// options.setStatusBarColor(ContextCompat.getColor(getContext(), R.color.ps_color_grey));
+// options.setToolbarColor(ContextCompat.getColor(getContext(), R.color.ps_color_grey));
+// options.setToolbarWidgetColor(ContextCompat.getColor(getContext(), R.color.ps_color_white));
+// }
+ return options;
+ }
+}
diff --git a/baseSDK/src/main/java/com/dayu/utils/MPermissionUtils.java b/baseSDK/src/main/java/com/dayu/utils/MPermissionUtils.java
index 3ec81ee..1ad4133 100755
--- a/baseSDK/src/main/java/com/dayu/utils/MPermissionUtils.java
+++ b/baseSDK/src/main/java/com/dayu/utils/MPermissionUtils.java
@@ -10,8 +10,10 @@ import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
import android.provider.Settings;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AlertDialog;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
import com.dayu.widgets.CustomDialog;
import com.tbruyelle.rxpermissions2.RxPermissions;
@@ -40,7 +42,7 @@ public class MPermissionUtils {
requestPermissions(fragment, requestCode, permission, callback);
}
- public static void requestPermissionsResult(android.support.v4.app.Fragment fragment, int requestCode
+ public static void requestPermissionsResult(Fragment fragment, int requestCode
, String[] permission, OnPermissionListener callback) {
requestPermissions(fragment, requestCode, permission, callback);
}
@@ -73,8 +75,8 @@ public class MPermissionUtils {
} else if (object instanceof android.app.Fragment) {
((android.app.Fragment) object).requestPermissions(deniedPermissions
.toArray(new String[deniedPermissions.size()]), requestCode);
- } else if (object instanceof android.support.v4.app.Fragment) {
- ((android.support.v4.app.Fragment) object).requestPermissions(deniedPermissions
+ } else if (object instanceof Fragment) {
+ ((Fragment) object).requestPermissions(deniedPermissions
.toArray(new String[deniedPermissions.size()]), requestCode);
} else {
mRequestCode = -1;
@@ -90,8 +92,8 @@ public class MPermissionUtils {
Context context;
if (object instanceof android.app.Fragment) {
context = ((android.app.Fragment) object).getActivity();
- } else if (object instanceof android.support.v4.app.Fragment) {
- context = ((android.support.v4.app.Fragment) object).getActivity();
+ } else if (object instanceof Fragment) {
+ context = ((Fragment) object).getActivity();
} else {
context = (Activity) object;
}
@@ -178,7 +180,7 @@ public class MPermissionUtils {
}
boolean isActivity = object instanceof Activity;
- boolean isSupportFragment = object instanceof android.support.v4.app.Fragment;
+ boolean isSupportFragment = object instanceof Fragment;
boolean isAppFragment = object instanceof android.app.Fragment;
if (!(isActivity || isSupportFragment || isAppFragment)) {
diff --git a/baseSDK/src/main/java/com/dayu/utils/MediaChooseUtils.java b/baseSDK/src/main/java/com/dayu/utils/MediaChooseUtils.java
index 1230460..c4b00a0 100644
--- a/baseSDK/src/main/java/com/dayu/utils/MediaChooseUtils.java
+++ b/baseSDK/src/main/java/com/dayu/utils/MediaChooseUtils.java
@@ -5,11 +5,11 @@ import android.annotation.SuppressLint;
import android.app.Activity;
import android.os.Environment;
-import com.dayu.common.Constants;
-import com.luck.picture.lib.PictureSelectionModel;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelectionModel;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
-import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.config.SelectMimeType;
+import com.luck.picture.lib.config.SelectModeConfig;
import java.io.File;
@@ -19,7 +19,7 @@ public class MediaChooseUtils {
* 选择单张图片
*/
public static void chooseSigleImg(Activity activity) {
- chooseMedia(activity, PictureMimeType.ofImage(), 1, 0);
+ chooseMedia(activity, SelectMimeType.ofImage(), 1, 0);
}
public static void chooseLiveImg(Activity activity) {
@@ -28,10 +28,10 @@ public class MediaChooseUtils {
@SuppressLint("CheckResult")
@Override
public void onPermissionGranted() {
- PictureSelectionModel selector = getPictureSelectionModel(activity, PictureMimeType.ofImage(), 1, 0,0);
- selector.enableCrop(true)//是否裁剪
- .withAspectRatio(3, 2)
- .freeStyleCropEnabled(true);
+ PictureSelectionModel selector = getPictureSelectionModel(activity, SelectMimeType.ofImage(), 1, 0,0);
+// selector.enableCrop(true)//是否裁剪
+// .withAspectRatio(3, 2)
+// .freeStyleCropEnabled(true);
selector.forResult(PictureConfig.CHOOSE_REQUEST);
}
@@ -68,8 +68,8 @@ public class MediaChooseUtils {
@SuppressLint("CheckResult")
@Override
public void onPermissionGranted() {
- PictureSelectionModel selector = getPictureSelectionModel(activity, PictureMimeType.ofVideo(), 1, videoLength,videoLength);
- selector.isCamera(false).forResult(PictureConfig.CHOOSE_REQUEST);
+ PictureSelectionModel selector = getPictureSelectionModel(activity, SelectMimeType.ofVideo(), 1, videoLength,videoLength);
+ selector.isDisplayCamera(false).forResult(PictureConfig.CHOOSE_REQUEST);
}
@Override
@@ -88,8 +88,8 @@ public class MediaChooseUtils {
@SuppressLint("CheckResult")
@Override
public void onPermissionGranted() {
- PictureSelectionModel selector = getPictureSelectionModel(activity, PictureMimeType.ofVideo(), 1, videoLength,minLength);
- selector.isCamera(false).forResult(code);
+ PictureSelectionModel selector = getPictureSelectionModel(activity, SelectMimeType.ofVideo(), 1, videoLength,minLength);
+ selector.isDisplayCamera(false).forResult(code);
}
@Override
@@ -130,28 +130,38 @@ public class MediaChooseUtils {
}
public static PictureSelectionModel getPictureSelectionModel(Activity activity, int type, int maxCount, int videoLength, int minLength) {
+// return PictureSelector.create(activity)
+// .openGallery(type)//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+// .maxSelectNum(maxCount)// 最大图片选择数量 int
+// .imageSpanCount(4)// 每行显示个数 int
+// .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
+// .previewImage(true)// 是否可预览图片 true or false
+// .isCamera(true)// 是否显示拍照按钮 true or false
+// .recordVideoSecond(videoLength) //最大视频长度(秒)
+// .videoMaxSecond(videoLength) //最大视频长度(秒)
+// .videoMinSecond(minLength)
+// .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
+// .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
+// .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
+// .compress(true)// 是否压缩 true or false
+// .glideOverride(300, 500)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
+// .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
+// .compressSavePath(getPath())//压缩图片保存地址
+// .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
+// .minimumCompressSize(Constants.MINIMUM_COMPRESSSIZE)// 小于100kb的图片不压缩
+// // .enableCrop(true)//是否裁剪
+// // .freeStyleCropEnabled(true)
+// .synOrAsy(true);
return PictureSelector.create(activity)
.openGallery(type)//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
- .maxSelectNum(maxCount)// 最大图片选择数量 int
- .imageSpanCount(4)// 每行显示个数 int
- .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
- .previewImage(true)// 是否可预览图片 true or false
- .isCamera(true)// 是否显示拍照按钮 true or false
- .recordVideoSecond(videoLength) //最大视频长度(秒)
- .videoMaxSecond(videoLength) //最大视频长度(秒)
- .videoMinSecond(minLength)
- .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
- .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
- .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
- .compress(true)// 是否压缩 true or false
- .glideOverride(300, 500)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
- .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
- .compressSavePath(getPath())//压缩图片保存地址
- .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
- .minimumCompressSize(Constants.MINIMUM_COMPRESSSIZE)// 小于100kb的图片不压缩
- // .enableCrop(true)//是否裁剪
- // .freeStyleCropEnabled(true)
- .synOrAsy(true);
+ .setImageEngine(GlideEngine.createGlideEngine())
+// .setCropEngine(new ImageFileCropEngine())
+// .setFilterMaxFileSize(maxCount)
+ .setImageSpanCount(4)
+ .setSelectionMode(SelectModeConfig.MULTIPLE);
+// .isPreviewImage(true)
+// .isDisplayCamera(true)
+// .isSelectZoomAnim(true);
}
public static String getPath() {
diff --git a/baseSDK/src/main/java/com/dayu/utils/PictrueUtils.java b/baseSDK/src/main/java/com/dayu/utils/PictrueUtils.java
index 9e89831..234a553 100755
--- a/baseSDK/src/main/java/com/dayu/utils/PictrueUtils.java
+++ b/baseSDK/src/main/java/com/dayu/utils/PictrueUtils.java
@@ -9,10 +9,11 @@ import android.graphics.Matrix;
import android.media.ExifInterface;
import android.os.Environment;
-import com.luck.picture.lib.PictureSelectionModel;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelectionModel;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
-import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.config.SelectMimeType;
+import com.luck.picture.lib.config.SelectModeConfig;
import java.io.File;
import java.io.FileOutputStream;
@@ -135,25 +136,36 @@ public class PictrueUtils {
public static void showPicDialogs(Activity activity,int maxImgCout) {
PictureSelectionModel selector = PictureSelector.create(activity)
- .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
- .maxSelectNum(maxImgCout)// 最大图片选择数量 int
- .imageSpanCount(4)// 每行显示个数 int
- .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
- .previewImage(true)// 是否可预览图片 true or false
- .isCamera(true)// 是否显示拍照按钮 true or false
- .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
- .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
- .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
- .compress(true)// 是否压缩 true or false
- .glideOverride(300, 300)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
- .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
- .compressSavePath(getPath())//压缩图片保存地址
- .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
- .minimumCompressSize(100)// 小于100kb的图片不压缩
- .synOrAsy(true)//同步true或异步false 压缩 默认同步、
- .enableCrop(true)//是否裁剪
- .withAspectRatio(1, 1)
- .freeStyleCropEnabled(false);
+ .openGallery(SelectMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+// .setFilterMaxFileSize(maxImgCout)
+ .setImageEngine(GlideEngine.createGlideEngine())
+ .setCropEngine(new ImageFileCropEngine())
+ .setImageSpanCount(4)
+ .setSelectionMode(SelectModeConfig.MULTIPLE)
+ .isPreviewImage(true)
+ .isDisplayCamera(true)
+ .isSelectZoomAnim(true)
+ .setOutputCameraDir("/CustomPath");
+// PictureSelectionModel selector = PictureSelector.create(activity)
+// .openGallery(SelectMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+// .maxSelectNum(maxImgCout)// 最大图片选择数量 int
+// .imageSpanCount(4)// 每行显示个数 int
+// .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
+// .previewImage(true)// 是否可预览图片 true or false
+// .isCamera(true)// 是否显示拍照按钮 true or false
+// .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
+// .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
+// .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
+// .compress(true)// 是否压缩 true or false
+// .glideOverride(300, 300)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
+// .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
+// .compressSavePath(getPath())//压缩图片保存地址
+// .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
+// .minimumCompressSize(100)// 小于100kb的图片不压缩
+// .synOrAsy(true)//同步true或异步false 压缩 默认同步、
+// .enableCrop(true)//是否裁剪
+// .withAspectRatio(1, 1)
+// .freeStyleCropEnabled(false);
selector.forResult(PictureConfig.CHOOSE_REQUEST);
}
diff --git a/baseSDK/src/main/java/com/dayu/utils/ProgressUtil.java b/baseSDK/src/main/java/com/dayu/utils/ProgressUtil.java
index 4c3bc7b..e325c4d 100755
--- a/baseSDK/src/main/java/com/dayu/utils/ProgressUtil.java
+++ b/baseSDK/src/main/java/com/dayu/utils/ProgressUtil.java
@@ -5,7 +5,6 @@ import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import android.os.Message;
-import android.support.v7.app.AlertDialog;
import android.text.TextUtils;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -15,6 +14,8 @@ import android.view.Window;
import android.view.WindowManager;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+
import com.dayu.baselibrary.R;
import com.dayu.common.BaseApplication;
diff --git a/baseSDK/src/main/java/com/dayu/utils/SelectPicUtils.java b/baseSDK/src/main/java/com/dayu/utils/SelectPicUtils.java
index 5d0ea82..2f9e785 100644
--- a/baseSDK/src/main/java/com/dayu/utils/SelectPicUtils.java
+++ b/baseSDK/src/main/java/com/dayu/utils/SelectPicUtils.java
@@ -5,10 +5,11 @@ import android.annotation.SuppressLint;
import android.app.Activity;
import android.os.Environment;
-import com.luck.picture.lib.PictureSelectionModel;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelectionModel;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
-import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.config.SelectMimeType;
+import com.luck.picture.lib.config.SelectModeConfig;
import java.io.File;
@@ -50,24 +51,35 @@ public class SelectPicUtils {
public static void showPicDialogs(Activity activity, int size, boolean needCrop, int requestCode) {
PictureSelectionModel selector = PictureSelector.create(activity)
- .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
- .maxSelectNum(size)// 最大图片选择数量 int
- .imageSpanCount(4)// 每行显示个数 int
- .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
- .previewImage(true)// 是否可预览图片 true or false
- .isCamera(true)// 是否显示拍照按钮 true or false
- .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
- .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
- .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
- .compress(true)// 是否压缩 true or false
- .glideOverride(300, 500)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
- .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
- .compressSavePath(getPath())//压缩图片保存地址
- .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
-// .minimumCompressSize(100)// 小于100kb的图片不压缩
- .synOrAsy(true)//同步true或异步false 压缩 默认同步、
- .enableCrop(needCrop)//是否裁剪
- .freeStyleCropEnabled(needCrop);
+ .openGallery(SelectMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+// .setFilterMaxFileSize(size)
+ .setImageEngine(GlideEngine.createGlideEngine())
+ .setCropEngine(new ImageFileCropEngine())
+ .setImageSpanCount(4)
+ .setSelectionMode(SelectModeConfig.MULTIPLE)
+ .isPreviewImage(true)
+ .isDisplayCamera(true)
+ .isSelectZoomAnim(true)
+ .setOutputCameraDir("/CustomPath");
+// PictureSelectionModel selector = PictureSelector.create(activity)
+// .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+// .maxSelectNum(size)// 最大图片选择数量 int
+// .imageSpanCount(4)// 每行显示个数 int
+// .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
+// .previewImage(true)// 是否可预览图片 true or false
+// .isCamera(true)// 是否显示拍照按钮 true or false
+// .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
+// .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
+// .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
+// .compress(true)// 是否压缩 true or false
+// .glideOverride(300, 500)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
+// .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
+// .compressSavePath(getPath())//压缩图片保存地址
+// .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
+//// .minimumCompressSize(100)// 小于100kb的图片不压缩
+// .synOrAsy(true)//同步true或异步false 压缩 默认同步、
+// .enableCrop(needCrop)//是否裁剪
+// .freeStyleCropEnabled(needCrop);
selector.forResult(requestCode);
}
diff --git a/baseSDK/src/main/java/com/dayu/utils/TabLayoutUtils.java b/baseSDK/src/main/java/com/dayu/utils/TabLayoutUtils.java
index 23cb526..0f80a92 100644
--- a/baseSDK/src/main/java/com/dayu/utils/TabLayoutUtils.java
+++ b/baseSDK/src/main/java/com/dayu/utils/TabLayoutUtils.java
@@ -2,11 +2,12 @@ package com.dayu.utils;
import android.app.Activity;
import android.content.res.Resources;
-import android.support.design.widget.TabLayout;
import android.util.TypedValue;
import android.view.View;
import android.widget.LinearLayout;
+import com.google.android.material.tabs.TabLayout;
+
import java.lang.reflect.Field;
/**
@@ -29,7 +30,7 @@ public class TabLayoutUtils {
Class<?> tabLayout = tabs.getClass();
Field tabStrip = null;
try {
- tabStrip = tabLayout.getDeclaredField("mTabStrip");
+ tabStrip = tabLayout.getDeclaredField("slidingTabIndicator");
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
diff --git a/baseSDK/src/main/java/com/dayu/utils/TimeCountUtil2.java b/baseSDK/src/main/java/com/dayu/utils/TimeCountUtil2.java
index 7f64e7c..c8e4922 100644
--- a/baseSDK/src/main/java/com/dayu/utils/TimeCountUtil2.java
+++ b/baseSDK/src/main/java/com/dayu/utils/TimeCountUtil2.java
@@ -53,6 +53,6 @@ public class TimeCountUtil2 extends CountDownTimer {
public void onFinish() {
btn.setText(mAgain);
btn.setClickable(true);//重新获得点击
- btn.setTextColor(mActivity.getResources().getColor(R.color.white));
+ btn.setTextColor(mActivity.getResources().getColor(R.color.cl_white));
}
}
diff --git a/baseSDK/src/main/java/com/dayu/utils/ToastUtils.java b/baseSDK/src/main/java/com/dayu/utils/ToastUtils.java
index 61c352d..bc5a782 100755
--- a/baseSDK/src/main/java/com/dayu/utils/ToastUtils.java
+++ b/baseSDK/src/main/java/com/dayu/utils/ToastUtils.java
@@ -2,10 +2,11 @@ package com.dayu.utils;
import android.os.Handler;
import android.os.Looper;
-import android.support.annotation.StringRes;
import android.view.Gravity;
import android.widget.Toast;
+import androidx.annotation.StringRes;
+
/**
* 吐司工具类
* on 2017/8/22.
diff --git a/baseSDK/src/main/java/com/dayu/widgets/BadgeView.java b/baseSDK/src/main/java/com/dayu/widgets/BadgeView.java
index 38cafd7..dfcd206 100644
--- a/baseSDK/src/main/java/com/dayu/widgets/BadgeView.java
+++ b/baseSDK/src/main/java/com/dayu/widgets/BadgeView.java
@@ -15,12 +15,14 @@ import android.widget.FrameLayout;
import android.widget.FrameLayout.LayoutParams;
import android.widget.TabWidget;
+import androidx.appcompat.widget.AppCompatTextView;
+
/**
* Created by luofan
* on 2018/12/14.
*/
-public class BadgeView extends android.support.v7.widget.AppCompatTextView {
+public class BadgeView extends AppCompatTextView {
private boolean mHideOnNull = true;
diff --git a/baseSDK/src/main/java/com/dayu/widgets/CircleImageView.java b/baseSDK/src/main/java/com/dayu/widgets/CircleImageView.java
index a6b0747..fe2f662 100755
--- a/baseSDK/src/main/java/com/dayu/widgets/CircleImageView.java
+++ b/baseSDK/src/main/java/com/dayu/widgets/CircleImageView.java
@@ -16,6 +16,8 @@ import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.util.AttributeSet;
+import androidx.appcompat.widget.AppCompatImageView;
+
import com.dayu.baselibrary.R;
@@ -23,7 +25,7 @@ import com.dayu.baselibrary.R;
* Created by yu on 2017/8/24.
*/
-public class CircleImageView extends android.support.v7.widget.AppCompatImageView {
+public class CircleImageView extends AppCompatImageView {
private static final ScaleType SCALE_TYPE = ScaleType.CENTER_CROP;
private static final Bitmap.Config BITMAP_CONFIG = Bitmap.Config.ARGB_8888;
private static final int COLORDRAWABLE_DIMENSION = 2;
diff --git a/baseSDK/src/main/java/com/dayu/widgets/DisableEditText.java b/baseSDK/src/main/java/com/dayu/widgets/DisableEditText.java
index 9e25094..d479028 100644
--- a/baseSDK/src/main/java/com/dayu/widgets/DisableEditText.java
+++ b/baseSDK/src/main/java/com/dayu/widgets/DisableEditText.java
@@ -1,7 +1,8 @@
package com.dayu.widgets;
import android.content.Context;
-import android.support.v7.widget.AppCompatEditText;
+
+import androidx.appcompat.widget.AppCompatEditText;
public class DisableEditText extends AppCompatEditText {
public DisableEditText(Context context) {
diff --git a/baseSDK/src/main/java/com/dayu/widgets/FixedViewPager.java b/baseSDK/src/main/java/com/dayu/widgets/FixedViewPager.java
index f61cf20..fb69a47 100644
--- a/baseSDK/src/main/java/com/dayu/widgets/FixedViewPager.java
+++ b/baseSDK/src/main/java/com/dayu/widgets/FixedViewPager.java
@@ -1,12 +1,13 @@
package com.dayu.widgets;
import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
import android.util.AttributeSet;
import android.view.MotionEvent;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
+
public class FixedViewPager extends ViewPager {
public FixedViewPager(@NonNull Context context) {
super(context);
diff --git a/baseSDK/src/main/java/com/dayu/widgets/LRecyclerView.java b/baseSDK/src/main/java/com/dayu/widgets/LRecyclerView.java
index c340260..adfc633 100644
--- a/baseSDK/src/main/java/com/dayu/widgets/LRecyclerView.java
+++ b/baseSDK/src/main/java/com/dayu/widgets/LRecyclerView.java
@@ -2,17 +2,18 @@ package com.dayu.widgets;
import android.content.Context;
import android.content.res.TypedArray;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.util.AttributeSet;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
import com.dayu.base.api.protocol.BasePageBean;
import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.base.ui.adapter.TypeSelector;
diff --git a/baseSDK/src/main/java/com/dayu/widgets/LicenceDialog.java b/baseSDK/src/main/java/com/dayu/widgets/LicenceDialog.java
index 8aa70a8..949ac70 100644
--- a/baseSDK/src/main/java/com/dayu/widgets/LicenceDialog.java
+++ b/baseSDK/src/main/java/com/dayu/widgets/LicenceDialog.java
@@ -3,11 +3,12 @@ package com.dayu.widgets;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+
import com.dayu.baselibrary.R;
/**
diff --git a/baseSDK/src/main/java/com/dayu/widgets/PhotoView.java b/baseSDK/src/main/java/com/dayu/widgets/PhotoView.java
index f8829de..bb9a364 100644
--- a/baseSDK/src/main/java/com/dayu/widgets/PhotoView.java
+++ b/baseSDK/src/main/java/com/dayu/widgets/PhotoView.java
@@ -6,7 +6,6 @@ import android.app.Activity;
import android.content.Context;
import android.content.res.TypedArray;
import android.os.Environment;
-import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
@@ -15,14 +14,19 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
+import androidx.annotation.Nullable;
+
import com.dayu.baselibrary.R;
+import com.dayu.utils.GlideEngine;
import com.dayu.utils.GlideImageLoader;
+import com.dayu.utils.ImageFileCropEngine;
import com.dayu.utils.MPermissionUtils;
import com.dayu.utils.UtilsScreen;
-import com.luck.picture.lib.PictureSelectionModel;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelectionModel;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
-import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.config.SelectMimeType;
+import com.luck.picture.lib.config.SelectModeConfig;
import java.io.File;
import java.util.ArrayList;
@@ -130,24 +134,36 @@ public class PhotoView extends LinearLayout {
int size;
size = 10 - mImgs.size();
PictureSelectionModel selector = PictureSelector.create(mContext)
- .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
- .maxSelectNum(size)// 最大图片选择数量 int
- .imageSpanCount(4)// 每行显示个数 int
- .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
- .previewImage(true)// 是否可预览图片 true or false
- .isCamera(true)// 是否显示拍照按钮 true or false
- .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
- .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
- .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
- .compress(true)// 是否压缩 true or false
- .glideOverride(300, 500)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
- .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
- .compressSavePath(getPath())//压缩图片保存地址
- .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
-// .minimumCompressSize(100)// 小于100kb的图片不压缩
- .synOrAsy(true);//同步true或异步false 压缩 默认同步、
-// .enableCrop(true)//是否裁剪
-// .freeStyleCropEnabled(true)
+ .openGallery(SelectMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+// .setFilterMaxFileSize(size)
+ .setImageEngine(GlideEngine.createGlideEngine())
+ .setCropEngine(new ImageFileCropEngine())
+ .setImageSpanCount(4)
+ .setSelectionMode(SelectModeConfig.MULTIPLE)
+ .isPreviewImage(true)
+ .isDisplayCamera(true)
+ .isSelectZoomAnim(true)
+ .setOutputCameraDir("/CustomPath");
+
+// PictureSelectionModel selector = PictureSelector.create(mContext)
+// .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+// .maxSelectNum(size)// 最大图片选择数量 int
+// .imageSpanCount(4)// 每行显示个数 int
+// .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
+// .previewImage(true)// 是否可预览图片 true or false
+// .isCamera(true)// 是否显示拍照按钮 true or false
+// .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
+// .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
+// .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
+// .compress(true)// 是否压缩 true or false
+// .glideOverride(300, 500)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
+// .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
+// .compressSavePath(getPath())//压缩图片保存地址
+// .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
+//// .minimumCompressSize(100)// 小于100kb的图片不压缩
+// .synOrAsy(true);//同步true或异步false 压缩 默认同步、
+//// .enableCrop(true)//是否裁剪
+//// .freeStyleCropEnabled(true)
selector.forResult(PictureConfig.CHOOSE_REQUEST);
}
diff --git a/baseSDK/src/main/java/com/dayu/widgets/RegisterDialog.java b/baseSDK/src/main/java/com/dayu/widgets/RegisterDialog.java
index adb1b6f..a6d4781 100644
--- a/baseSDK/src/main/java/com/dayu/widgets/RegisterDialog.java
+++ b/baseSDK/src/main/java/com/dayu/widgets/RegisterDialog.java
@@ -3,11 +3,12 @@ package com.dayu.widgets;
import android.app.Dialog;
import android.content.Context;
import android.os.Bundle;
-import android.support.annotation.NonNull;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+
import com.dayu.baselibrary.R;
/**
diff --git a/baseSDK/src/main/java/com/dayu/widgets/SwitchImage.java b/baseSDK/src/main/java/com/dayu/widgets/SwitchImage.java
index 81f2a79..ab741ca 100755
--- a/baseSDK/src/main/java/com/dayu/widgets/SwitchImage.java
+++ b/baseSDK/src/main/java/com/dayu/widgets/SwitchImage.java
@@ -3,6 +3,8 @@ package com.dayu.widgets;
import android.content.Context;
import android.util.AttributeSet;
+import androidx.appcompat.widget.AppCompatImageView;
+
import com.dayu.baselibrary.R;
@@ -11,7 +13,7 @@ import com.dayu.baselibrary.R;
* on 2017/9/21.
*/
-public class SwitchImage extends android.support.v7.widget.AppCompatImageView {
+public class SwitchImage extends AppCompatImageView {
public boolean switchButton = false;
public boolean getSwitchButton() {
diff --git a/baseSDK/src/main/java/com/dayu/widgets/TextDialog.java b/baseSDK/src/main/java/com/dayu/widgets/TextDialog.java
index 665aee0..cb0f45d 100644
--- a/baseSDK/src/main/java/com/dayu/widgets/TextDialog.java
+++ b/baseSDK/src/main/java/com/dayu/widgets/TextDialog.java
@@ -2,15 +2,16 @@ package com.dayu.widgets;
import android.app.Activity;
import android.app.Dialog;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.baselibrary.R;
diff --git a/baseSDK/src/main/java/com/dayu/widgets/WheelDialog.java b/baseSDK/src/main/java/com/dayu/widgets/WheelDialog.java
index f1b07ec..591dfe0 100644
--- a/baseSDK/src/main/java/com/dayu/widgets/WheelDialog.java
+++ b/baseSDK/src/main/java/com/dayu/widgets/WheelDialog.java
@@ -2,8 +2,6 @@ package com.dayu.widgets;
import android.app.Activity;
import android.app.Dialog;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
diff --git a/baseSDK/src/main/res/layout/acitivity_preview.xml b/baseSDK/src/main/res/layout/acitivity_preview.xml
index dfcd888..4c66555 100644
--- a/baseSDK/src/main/res/layout/acitivity_preview.xml
+++ b/baseSDK/src/main/res/layout/acitivity_preview.xml
@@ -20,7 +20,7 @@
style="@style/title_image_back" />
</RelativeLayout>
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/vp_preview"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
diff --git a/baseSDK/src/main/res/layout/dialog_live_back_text.xml b/baseSDK/src/main/res/layout/dialog_live_back_text.xml
index 8d47553..3880edf 100644
--- a/baseSDK/src/main/res/layout/dialog_live_back_text.xml
+++ b/baseSDK/src/main/res/layout/dialog_live_back_text.xml
@@ -26,7 +26,7 @@
/>
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_text"
android:layout_margin="15dp"
android:layout_width="match_parent"
diff --git a/baseSDK/src/main/res/layout/dialog_text.xml b/baseSDK/src/main/res/layout/dialog_text.xml
index 8522a01..cd45042 100644
--- a/baseSDK/src/main/res/layout/dialog_text.xml
+++ b/baseSDK/src/main/res/layout/dialog_text.xml
@@ -5,7 +5,7 @@
android:orientation="vertical">
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_text"
android:background="@color/white"
android:layout_marginLeft="30dp"
diff --git a/baseSDK/src/main/res/layout/dialog_text_bottom.xml b/baseSDK/src/main/res/layout/dialog_text_bottom.xml
index 3448447..35a5e29 100644
--- a/baseSDK/src/main/res/layout/dialog_text_bottom.xml
+++ b/baseSDK/src/main/res/layout/dialog_text_bottom.xml
@@ -5,7 +5,7 @@
android:orientation="vertical">
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_text"
android:background="@color/white"
android:layout_width="match_parent"
diff --git a/baseSDK/src/main/res/layout/lrecycle_layout.xml b/baseSDK/src/main/res/layout/lrecycle_layout.xml
index 06156ba..dcd5153 100755
--- a/baseSDK/src/main/res/layout/lrecycle_layout.xml
+++ b/baseSDK/src/main/res/layout/lrecycle_layout.xml
@@ -4,18 +4,18 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <android.support.v4.widget.SwipeRefreshLayout
+ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swiperefresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:cacheColorHint="@null"
android:scrollbars="none" />
- </android.support.v4.widget.SwipeRefreshLayout>
+ </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<LinearLayout
diff --git a/baseSDK/src/main/res/values/colors.xml b/baseSDK/src/main/res/values/colors.xml
index 0754ffc..0a25ebb 100755
--- a/baseSDK/src/main/res/values/colors.xml
+++ b/baseSDK/src/main/res/values/colors.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="cl_white">#ffffff</color>
+ <color name="white">#ffffff</color>
<color name="cl_primarydark">#303F9F</color>
<color name="cl_accent">#ff00</color>
<color name="cl_text">#8a8a8a</color>
@@ -52,6 +53,10 @@
<color name="table_record_title_bg">#78d3f6</color>
<color name="top_tab_selected_bg">#d7d7d7</color>
-
-
+ <color name="color_69">#999999</color>
+ <color name="color_orange">#E0FF6100</color>
+ <color name="color_fa">#FAFAFA</color>
+ <color name="color_f2">#F2F2F2</color>
+ <color name="blue">#7D7DFF</color>
+ <color name="color_53">#53575e</color>
</resources>
diff --git a/beauty/src/main/java/com/tencent/liteav/demo/beauty/IconTextAdapter.java b/beauty/src/main/java/com/tencent/liteav/demo/beauty/IconTextAdapter.java
index 8ef97b0..c787846 100644
--- a/beauty/src/main/java/com/tencent/liteav/demo/beauty/IconTextAdapter.java
+++ b/beauty/src/main/java/com/tencent/liteav/demo/beauty/IconTextAdapter.java
@@ -2,7 +2,6 @@ package com.tencent.liteav.demo.beauty;
import android.content.Context;
import android.graphics.Color;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -10,6 +9,8 @@ import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+
import java.util.ArrayList;
public class IconTextAdapter extends BaseAdapter {
diff --git a/beauty/src/main/java/com/tencent/liteav/demo/beauty/MaterialDownloader.java b/beauty/src/main/java/com/tencent/liteav/demo/beauty/MaterialDownloader.java
index 6cc078b..a7c48db 100644
--- a/beauty/src/main/java/com/tencent/liteav/demo/beauty/MaterialDownloader.java
+++ b/beauty/src/main/java/com/tencent/liteav/demo/beauty/MaterialDownloader.java
@@ -3,10 +3,11 @@ package com.tencent.liteav.demo.beauty;
import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
import android.text.TextUtils;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import java.io.File;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingDeque;
diff --git a/beauty/src/main/java/com/tencent/liteav/demo/beauty/VideoDeviceUtil.java b/beauty/src/main/java/com/tencent/liteav/demo/beauty/VideoDeviceUtil.java
index cf89c49..24396ac 100644
--- a/beauty/src/main/java/com/tencent/liteav/demo/beauty/VideoDeviceUtil.java
+++ b/beauty/src/main/java/com/tencent/liteav/demo/beauty/VideoDeviceUtil.java
@@ -3,10 +3,11 @@ package com.tencent.liteav.demo.beauty;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import java.io.File;
public class VideoDeviceUtil {
diff --git a/beauty/src/main/java/com/tencent/liteav/demo/beauty/VideoUtil.java b/beauty/src/main/java/com/tencent/liteav/demo/beauty/VideoUtil.java
index 4f8ba7d..8e33cd5 100644
--- a/beauty/src/main/java/com/tencent/liteav/demo/beauty/VideoUtil.java
+++ b/beauty/src/main/java/com/tencent/liteav/demo/beauty/VideoUtil.java
@@ -1,9 +1,10 @@
package com.tencent.liteav.demo.beauty;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
import android.text.TextUtils;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
diff --git a/build.gradle b/build.gradle
index 0d1095c..85a7dd8 100755
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "29.0.2"
ext.min_sdk_version = 21
ext.target_sdk_version = 29
- ext.version_code = 310
- ext.verson_name = "3.1.0"
+ ext.version_code = 311
+ ext.verson_name = "3.1.1"
ext.gradle_version = '4.0.1'
ext.isReleaseMinify = false
ext.isDebugMinify = false
diff --git a/camera/src/main/java/com/cjt2325/cameralibrary/FoucsView.java b/camera/src/main/java/com/cjt2325/cameralibrary/FoucsView.java
index 2c421e9..3f93275 100644
--- a/camera/src/main/java/com/cjt2325/cameralibrary/FoucsView.java
+++ b/camera/src/main/java/com/cjt2325/cameralibrary/FoucsView.java
@@ -3,10 +3,11 @@ package com.cjt2325.cameralibrary;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Paint;
-import android.support.annotation.Nullable;
import android.util.AttributeSet;
import android.view.View;
+import androidx.annotation.Nullable;
+
import com.cjt2325.cameralibrary.util.ScreenUtils;
/**
diff --git a/camera/src/main/java/com/cjt2325/cameralibrary/JCameraView.java b/camera/src/main/java/com/cjt2325/cameralibrary/JCameraView.java
index 7a51e9e..333cc8d 100644
--- a/camera/src/main/java/com/cjt2325/cameralibrary/JCameraView.java
+++ b/camera/src/main/java/com/cjt2325/cameralibrary/JCameraView.java
@@ -9,7 +9,6 @@ import android.hardware.Camera;
import android.media.AudioManager;
import android.media.MediaPlayer;
import android.os.Build;
-import android.support.annotation.RequiresApi;
import android.util.AttributeSet;
import android.util.Log;
import android.util.TypedValue;
@@ -22,6 +21,8 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.VideoView;
+import androidx.annotation.RequiresApi;
+
import com.cjt2325.cameralibrary.listener.CaptureListener;
import com.cjt2325.cameralibrary.listener.ClickListener;
import com.cjt2325.cameralibrary.listener.ErrorListener;
diff --git a/captcha/src/main/java/com/example/verificationcodejavademo/widget/DiyStyleTextView.java b/captcha/src/main/java/com/example/verificationcodejavademo/widget/DiyStyleTextView.java
index 8fb2de6..5fdfcc4 100644
--- a/captcha/src/main/java/com/example/verificationcodejavademo/widget/DiyStyleTextView.java
+++ b/captcha/src/main/java/com/example/verificationcodejavademo/widget/DiyStyleTextView.java
@@ -1,7 +1,6 @@
package com.example.verificationcodejavademo.widget;
import android.content.Context;
-import android.support.v7.widget.AppCompatTextView;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.TextPaint;
@@ -11,6 +10,7 @@ import android.util.AttributeSet;
import android.view.View;
import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatTextView;
import java.util.ArrayList;
import java.util.List;
diff --git a/gradle.properties b/gradle.properties
index 30cde37..ec6270c 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,6 @@ BASE_URL=http://47.94.101.239:3112
IS_64_BIT=true
Android.useDeprecatedNdk=true
-android.useAndroidX=true
\ No newline at end of file
+android.useAndroidX=true
+android.enableJetifier=true
+org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=512m
\ No newline at end of file
diff --git a/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/CourseDetailActivity.java b/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/CourseDetailActivity.java
index d70bfdb..e5d10af 100644
--- a/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/CourseDetailActivity.java
+++ b/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/CourseDetailActivity.java
@@ -2,10 +2,11 @@ package com.dayu.learncenter.ui.activity;
import android.annotation.SuppressLint;
import android.content.Intent;
-import android.support.v7.widget.LinearLayoutManager;
import android.text.TextUtils;
import android.view.View;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.badoo.mobile.util.WeakHandler;
import com.dayu.base.api.Api;
import com.dayu.base.api.protocol.AddShareRecordData;
diff --git a/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/EditCourseActivity.java b/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/EditCourseActivity.java
index e3c8a58..ac48667 100644
--- a/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/EditCourseActivity.java
+++ b/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/EditCourseActivity.java
@@ -7,7 +7,6 @@ import android.text.TextUtils;
import android.view.View;
import com.dayu.base.ui.activity.BaseActivity;
-import com.dayu.base.ui.activity.CameraActivity;
import com.dayu.common.Constants;
import com.dayu.learncenter.R;
import com.dayu.learncenter.api.bean.CourseDeatilBean;
@@ -22,19 +21,18 @@ import com.dayu.utils.ToastUtils;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.JZMediaIjk;
import com.dayu.widgets.TextDialog;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelectionCameraModel;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
+import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.TimeUnit;
import cn.jzvd.Jzvd;
import cn.jzvd.JzvdStd;
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
public class EditCourseActivity extends BaseActivity<PubCoursePresenter, ActivityPubCourseBinding>
implements PubCourseContract.View {
@@ -197,13 +195,16 @@ public class EditCourseActivity extends BaseActivity<PubCoursePresenter, Activit
@SuppressLint("CheckResult")
@Override
public void onPermissionGranted() {
- Observable.timer(1000, TimeUnit.MILLISECONDS)
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(aLong -> {
- Intent intent = new Intent(EditCourseActivity.this, CameraActivity.class);
- intent.putExtra(Constants.ONLY_VIDEO, true);
- startActivityForResult(intent, Constants.CAMERA_CODE);
- });
+// Observable.timer(1000, TimeUnit.MILLISECONDS)
+// .observeOn(AndroidSchedulers.mainThread())
+// .subscribe(aLong -> {
+// Intent intent = new Intent(EditCourseActivity.this, CameraActivity.class);
+// intent.putExtra(Constants.ONLY_VIDEO, true);
+// startActivityForResult(intent, Constants.CAMERA_CODE);
+// });
+ PictureSelectionCameraModel pictureSelectionCameraModel = PictureSelector.create(EditCourseActivity.this)
+ .openCamera(SelectMimeType.ofVideo());
+ pictureSelectionCameraModel.forResultActivity(1002);
}
@Override
@@ -238,9 +239,12 @@ public class EditCourseActivity extends BaseActivity<PubCoursePresenter, Activit
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
- List<LocalMedia> mSelectList = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> mSelectList = PictureSelector.obtainSelectorList(data);
if (mSelectList != null) {
videoPath = mSelectList.get(0).getPath();
+ if (videoPath.contains("content")){
+ videoPath = mSelectList.get(0).getRealPath();
+ }
File file = new File(videoPath);
if (file.length() > 300 * 1024 * 1024) {
showToast(R.string.video_file_too_large);
@@ -250,6 +254,22 @@ public class EditCourseActivity extends BaseActivity<PubCoursePresenter, Activit
}
}
break;
+ case 1002:
+ List<LocalMedia> mSelectList1 = PictureSelector.obtainSelectorList(data);
+ if (mSelectList1 != null) {
+ videoPath = mSelectList1.get(0).getPath();
+ if (videoPath.contains("content")){
+ videoPath = mSelectList1.get(0).getRealPath();
+ }
+ File file = new File(videoPath);
+ if (file.length() > 500 * 1024 * 1024) {
+ showToast(R.string.video_file_too_large);
+ videoPath = "";
+ } else {
+ setVideoView();
+ }
+ }
+ break;
}
} else if (resultCode == Constants.CAMERA_VIDEO) {
videoPath = data.getStringExtra("videoPath");
diff --git a/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/KnowledgeQueryActivity.java b/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/KnowledgeQueryActivity.java
index 21903fd..453fc39 100644
--- a/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/KnowledgeQueryActivity.java
+++ b/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/KnowledgeQueryActivity.java
@@ -3,10 +3,11 @@ package com.dayu.learncenter.ui.activity;
import android.graphics.Color;
import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
import android.text.TextUtils;
import android.view.View;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter;
diff --git a/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/PrepareLiveActivity.java b/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/PrepareLiveActivity.java
index 5f34800..78e9a2e 100644
--- a/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/PrepareLiveActivity.java
+++ b/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/PrepareLiveActivity.java
@@ -17,7 +17,7 @@ import com.dayu.livemodule.xiaozhibo.login.TCUserMgr;
import com.dayu.provider.router.RouterPath;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.MediaChooseUtils;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia;
@@ -87,7 +87,7 @@ public class PrepareLiveActivity extends BaseActivity<SImplePresenter, ActivityP
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
- List<LocalMedia> mSelectList = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> mSelectList = PictureSelector.obtainSelectorList(data);
if (mSelectList != null && mSelectList.size()>0) {
uploadPic(mSelectList.get(0).getCutPath());
// TCUserMgr.getInstance().setCoverPic(mSelectList.get(0).getCutPath(), null);
diff --git a/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/PubCourseActivity.java b/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/PubCourseActivity.java
index f381d0a..74f43a6 100644
--- a/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/PubCourseActivity.java
+++ b/learnCenter/src/main/java/com/dayu/learncenter/ui/activity/PubCourseActivity.java
@@ -22,10 +22,11 @@ import com.dayu.utils.MPermissionUtils;
import com.dayu.utils.MediaChooseUtils;
import com.dayu.utils.ToastUtils;
import com.dayu.widgets.TextDialog;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelectionCameraModel;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
+import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;
-//import com.umeng.analytics.MobclickAgent;
import org.greenrobot.eventbus.EventBus;
@@ -120,13 +121,16 @@ public class PubCourseActivity extends BaseActivity<PubCoursePresenter, Activity
@SuppressLint("CheckResult")
@Override
public void onPermissionGranted() {
- Observable.timer(1000, TimeUnit.MILLISECONDS)
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(aLong -> {
- Intent intent = new Intent(PubCourseActivity.this, CameraActivity.class);
- intent.putExtra(Constants.ONLY_VIDEO, true);
- startActivityForResult(intent, Constants.CAMERA_CODE);
- });
+// Observable.timer(1000, TimeUnit.MILLISECONDS)
+// .observeOn(AndroidSchedulers.mainThread())
+// .subscribe(aLong -> {
+// Intent intent = new Intent(PubCourseActivity.this, CameraActivity.class);
+// intent.putExtra(Constants.ONLY_VIDEO, true);
+// startActivityForResult(intent, Constants.CAMERA_CODE);
+// });
+ PictureSelectionCameraModel pictureSelectionCameraModel = PictureSelector.create(PubCourseActivity.this)
+ .openCamera(SelectMimeType.ofVideo());
+ pictureSelectionCameraModel.forResultActivity(1002);
}
@Override
@@ -171,9 +175,28 @@ public class PubCourseActivity extends BaseActivity<PubCoursePresenter, Activity
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
- List<LocalMedia> mSelectList = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> mSelectList = PictureSelector.obtainSelectorList(data);
if (mSelectList != null) {
videoPath = mSelectList.get(0).getPath();
+ if (videoPath.contains("content")){
+ videoPath = mSelectList.get(0).getRealPath();
+ }
+ File file = new File(videoPath);
+ if (file.length() > 500 * 1024 * 1024) {
+ showToast(R.string.video_file_too_large);
+ videoPath = "";
+ } else {
+ setVideoView();
+ }
+ }
+ break;
+ case 1002:
+ List<LocalMedia> mSelectList1 = PictureSelector.obtainSelectorList(data);
+ if (mSelectList1 != null) {
+ videoPath = mSelectList1.get(0).getPath();
+ if (videoPath.contains("content")){
+ videoPath = mSelectList1.get(0).getRealPath();
+ }
File file = new File(videoPath);
if (file.length() > 500 * 1024 * 1024) {
showToast(R.string.video_file_too_large);
diff --git a/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/CommonLearnFragment.java b/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/CommonLearnFragment.java
index 198e2e1..d3862e3 100644
--- a/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/CommonLearnFragment.java
+++ b/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/CommonLearnFragment.java
@@ -1,12 +1,13 @@
package com.dayu.learncenter.ui.fragment;
import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
import android.text.Editable;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.EditorInfo;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.dayu.base.api.Api;
import com.dayu.base.api.protocol.AddShareRecordData;
import com.dayu.base.ui.fragment.BaseFragment;
diff --git a/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/HomeLearnFragment.java b/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/HomeLearnFragment.java
index 3a3939d..64b616e 100644
--- a/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/HomeLearnFragment.java
+++ b/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/HomeLearnFragment.java
@@ -2,13 +2,13 @@ package com.dayu.learncenter.ui.fragment;
import android.content.res.AssetManager;
import android.graphics.Typeface;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.api.APIService;
import com.dayu.base.api.Api;
@@ -28,6 +28,7 @@ import com.dayu.provider.router.RouterPath;
import com.dayu.utils.TabLayoutUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
+import com.google.android.material.tabs.TabLayout;
import com.umeng.analytics.MobclickAgent;
import com.youth.banner.WeakHandler;
diff --git a/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/KnowledgeCenterFragment.java b/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/KnowledgeCenterFragment.java
index a8b2ff5..a95c1c2 100644
--- a/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/KnowledgeCenterFragment.java
+++ b/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/KnowledgeCenterFragment.java
@@ -1,7 +1,8 @@
package com.dayu.learncenter.ui.fragment;
import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter;
diff --git a/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/LiveListFragment.java b/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/LiveListFragment.java
index e8c748b..d0ce7ea 100644
--- a/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/LiveListFragment.java
+++ b/learnCenter/src/main/java/com/dayu/learncenter/ui/fragment/LiveListFragment.java
@@ -1,10 +1,11 @@
package com.dayu.learncenter.ui.fragment;
import android.content.Intent;
-import android.support.v7.widget.LinearLayoutManager;
import android.text.TextUtils;
import android.widget.ImageView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.base.api.APIService;
diff --git a/learnCenter/src/main/res/layout/activity_course_detail.xml b/learnCenter/src/main/res/layout/activity_course_detail.xml
index c73576b..a41686a 100644
--- a/learnCenter/src/main/res/layout/activity_course_detail.xml
+++ b/learnCenter/src/main/res/layout/activity_course_detail.xml
@@ -49,7 +49,7 @@
android:layout_above="@+id/btn_comment"
>
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:id="@+id/nsv_learn"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -211,14 +211,14 @@
</LinearLayout>
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_component"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp" />
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
<Button
diff --git a/learnCenter/src/main/res/layout/activity_konwledge_query.xml b/learnCenter/src/main/res/layout/activity_konwledge_query.xml
index 56f1bb7..7adbb0c 100644
--- a/learnCenter/src/main/res/layout/activity_konwledge_query.xml
+++ b/learnCenter/src/main/res/layout/activity_konwledge_query.xml
@@ -81,7 +81,7 @@
android:layout_height="match_parent"
android:background="#f5f5f5">
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_knowledge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/learnCenter/src/main/res/layout/fragment_home_learn.xml b/learnCenter/src/main/res/layout/fragment_home_learn.xml
index adc1f7a..542322c 100644
--- a/learnCenter/src/main/res/layout/fragment_home_learn.xml
+++ b/learnCenter/src/main/res/layout/fragment_home_learn.xml
@@ -62,7 +62,7 @@
android:textColor="@color/common_red"
android:textSize="15dp" />
- <android.support.design.widget.TabLayout
+ <com.google.android.material.tabs.TabLayout
android:id="@+id/tab_learn"
android:layout_width="match_parent"
android:layout_height="78dp"
@@ -74,7 +74,7 @@
<ImageView style="@style/card_line" />
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/vp_learn"
android:layout_width="match_parent"
android:layout_height="0dp"
diff --git a/learnCenter/src/main/res/layout/fragment_konwledge_center.xml b/learnCenter/src/main/res/layout/fragment_konwledge_center.xml
index 4562593..04ab1c9 100644
--- a/learnCenter/src/main/res/layout/fragment_konwledge_center.xml
+++ b/learnCenter/src/main/res/layout/fragment_konwledge_center.xml
@@ -25,7 +25,7 @@
android:layout_height="match_parent"
android:layout_marginTop="2dp">
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_knowledge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/learnCenter/src/main/res/layout/fragment_live_list.xml b/learnCenter/src/main/res/layout/fragment_live_list.xml
index 618e5dc..11e1db7 100644
--- a/learnCenter/src/main/res/layout/fragment_live_list.xml
+++ b/learnCenter/src/main/res/layout/fragment_live_list.xml
@@ -7,7 +7,7 @@
android:layout_height="match_parent"
android:background="#f5f5f5">
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -16,20 +16,20 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_live"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_video"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never" />
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</layout>
\ No newline at end of file
diff --git a/liveModule/src/main/java/com/dayu/livemodule/roomutil/http/HttpRequests.java b/liveModule/src/main/java/com/dayu/livemodule/roomutil/http/HttpRequests.java
index af9b5e8..07f0906 100644
--- a/liveModule/src/main/java/com/dayu/livemodule/roomutil/http/HttpRequests.java
+++ b/liveModule/src/main/java/com/dayu/livemodule/roomutil/http/HttpRequests.java
@@ -1,9 +1,10 @@
package com.dayu.livemodule.roomutil.http;
-import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.Nullable;
+
import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
diff --git a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/TCCameraAnchorActivity.java b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/TCCameraAnchorActivity.java
index 9f003b1..57e8578 100644
--- a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/TCCameraAnchorActivity.java
+++ b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/TCCameraAnchorActivity.java
@@ -7,9 +7,6 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
@@ -20,6 +17,10 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.dayu.livemodule.R;
import com.dayu.livemodule.roomutil.commondef.AnchorInfo;
import com.dayu.livemodule.xiaozhibo.anchor.music.TCAudioControl;
diff --git a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/music/MusicEntity.java b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/music/MusicEntity.java
index c0d0df0..a4c5426 100644
--- a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/music/MusicEntity.java
+++ b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/music/MusicEntity.java
@@ -3,7 +3,8 @@ package com.dayu.livemodule.xiaozhibo.anchor.music;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
public class MusicEntity implements Parcelable {
//id标识
diff --git a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/prepare/TCAnchorPrepareActivity.java b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/prepare/TCAnchorPrepareActivity.java
index 12a001a..940d05c 100644
--- a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/prepare/TCAnchorPrepareActivity.java
+++ b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/prepare/TCAnchorPrepareActivity.java
@@ -11,10 +11,6 @@ import android.os.Build;
import android.os.Bundle;
import android.os.StrictMode;
import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.FileProvider;
import android.text.TextUtils;
import android.util.Log;
import android.view.Display;
@@ -27,6 +23,11 @@ import android.widget.RadioGroup;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.FileProvider;
+
import com.bumptech.glide.Glide;
import com.bumptech.glide.RequestManager;
import com.dayu.livemodule.R;
diff --git a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/prepare/TCLocationHelper.java b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/prepare/TCLocationHelper.java
index 249197d..052d694 100644
--- a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/prepare/TCLocationHelper.java
+++ b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/prepare/TCLocationHelper.java
@@ -15,11 +15,12 @@ import android.location.LocationManager;
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+
import com.dayu.livemodule.R;
import com.dayu.livemodule.xiaozhibo.common.utils.TCConstants;
diff --git a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/screen/TCScreenRecordService.java b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/screen/TCScreenRecordService.java
index 5596451..da3a302 100644
--- a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/screen/TCScreenRecordService.java
+++ b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/anchor/screen/TCScreenRecordService.java
@@ -10,7 +10,8 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.os.Build;
import android.os.IBinder;
-import android.support.v4.content.LocalBroadcastManager;
+
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.dayu.livemodule.xiaozhibo.common.utils.TCConstants;
diff --git a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/audience/TCAudienceActivity.java b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/audience/TCAudienceActivity.java
index 941c07f..998c683 100644
--- a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/audience/TCAudienceActivity.java
+++ b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/audience/TCAudienceActivity.java
@@ -8,8 +8,6 @@ import android.graphics.BitmapFactory;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
import android.view.Display;
@@ -24,6 +22,9 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.dayu.livemodule.IMLVBLiveRoomListener;
import com.dayu.livemodule.MLVBLiveRoom;
import com.dayu.livemodule.R;
@@ -122,7 +123,7 @@ public class TCAudienceActivity extends Activity implements IMLVBLiveRoomListene
private int baseUserCount = 500; //观众基数
//头像列表控件
- private RecyclerView mUserAvatarList;
+ private RecyclerView mUserAvatarList;
private TCUserAvatarListAdapter mAvatarListAdapter;
//点赞动画
diff --git a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/common/utils/TCUtils.java b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/common/utils/TCUtils.java
index 47396cb..2d78208 100644
--- a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/common/utils/TCUtils.java
+++ b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/common/utils/TCUtils.java
@@ -32,13 +32,14 @@ import android.renderscript.Allocation;
import android.renderscript.Element;
import android.renderscript.RenderScript;
import android.renderscript.ScriptIntrinsicBlur;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.PermissionChecker;
import android.text.TextUtils;
import android.util.TypedValue;
import android.widget.ImageView;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.PermissionChecker;
+
import com.bumptech.glide.Glide;
import com.bumptech.glide.RequestManager;
import com.bumptech.glide.load.engine.DiskCacheStrategy;
diff --git a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/common/widget/TCUserAvatarListAdapter.java b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/common/widget/TCUserAvatarListAdapter.java
index 962a356..4642a1a 100644
--- a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/common/widget/TCUserAvatarListAdapter.java
+++ b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/common/widget/TCUserAvatarListAdapter.java
@@ -1,12 +1,13 @@
package com.dayu.livemodule.xiaozhibo.common.widget;
import android.content.Context;
-import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.dayu.livemodule.R;
import com.dayu.livemodule.xiaozhibo.common.msg.TCSimpleUserInfo;
import com.dayu.livemodule.xiaozhibo.common.utils.TCUtils;
diff --git a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/common/widget/danmaku/TCCenteredImageSpan.java b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/common/widget/danmaku/TCCenteredImageSpan.java
index b47c44a..73f59aa 100644
--- a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/common/widget/danmaku/TCCenteredImageSpan.java
+++ b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/common/widget/danmaku/TCCenteredImageSpan.java
@@ -4,9 +4,10 @@ import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
import android.text.style.ImageSpan;
+import androidx.annotation.NonNull;
+
import java.lang.ref.WeakReference;
/**
diff --git a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/main/TCMainActivity.java b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/main/TCMainActivity.java
index 8e87553..a89a2b3 100644
--- a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/main/TCMainActivity.java
+++ b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/main/TCMainActivity.java
@@ -5,14 +5,15 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle;
-import android.support.v4.app.FragmentTabHost;
-import android.support.v7.app.AppCompatActivity;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
import android.widget.TabHost;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentTabHost;
+
import com.dayu.livemodule.IMLVBLiveRoomListener;
import com.dayu.livemodule.MLVBLiveRoom;
import com.dayu.livemodule.R;
diff --git a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/main/videolist/ui/TCVideoListFragment.java b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/main/videolist/ui/TCVideoListFragment.java
index c51249c..8caf97a 100644
--- a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/main/videolist/ui/TCVideoListFragment.java
+++ b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/main/videolist/ui/TCVideoListFragment.java
@@ -3,8 +3,6 @@ package com.dayu.livemodule.xiaozhibo.main.videolist.ui;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.widget.SwipeRefreshLayout;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
@@ -17,6 +15,9 @@ import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.fragment.app.Fragment;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
import com.dayu.livemodule.R;
import com.dayu.livemodule.xiaozhibo.TCGlobalConfig;
import com.dayu.livemodule.xiaozhibo.audience.TCAudienceActivity;
diff --git a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/playback/TCPlaybackActivity.java b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/playback/TCPlaybackActivity.java
index 3b6821c..b021f30 100644
--- a/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/playback/TCPlaybackActivity.java
+++ b/liveModule/src/main/java/com/dayu/livemodule/xiaozhibo/playback/TCPlaybackActivity.java
@@ -5,8 +5,6 @@ import android.app.FragmentTransaction;
import android.app.Service;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager;
import android.util.Log;
@@ -17,6 +15,9 @@ import android.widget.ImageView;
import android.widget.SeekBar;
import android.widget.TextView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.dayu.livemodule.R;
import com.dayu.livemodule.xiaozhibo.audience.TCAudienceActivity;
import com.dayu.livemodule.xiaozhibo.common.report.TCELKReportMgr;
@@ -60,7 +61,7 @@ public class TCPlaybackActivity extends Activity implements View.OnClickListener
private TextView mTvViewed; // 已观看数量
//头像列表控件
- private RecyclerView mRvAvatarList;
+ private RecyclerView mRvAvatarList;
private TCUserAvatarListAdapter mAvatarListAdapter;
private ImageView mIvCover; // 封面图
diff --git a/liveModule/src/main/res/layout/activity_audience.xml b/liveModule/src/main/res/layout/activity_audience.xml
index f4461ab..c86eccb 100644
--- a/liveModule/src/main/res/layout/activity_audience.xml
+++ b/liveModule/src/main/res/layout/activity_audience.xml
@@ -180,7 +180,7 @@
android:layout_height="wrap_content"
android:layout_margin="5dp" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/anchor_rv_avatar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/liveModule/src/main/res/layout/activity_camera_anchor.xml b/liveModule/src/main/res/layout/activity_camera_anchor.xml
index 500e337..80fef4d 100644
--- a/liveModule/src/main/res/layout/activity_camera_anchor.xml
+++ b/liveModule/src/main/res/layout/activity_camera_anchor.xml
@@ -201,7 +201,7 @@
android:layout_height="wrap_content"
android:layout_margin="5dp" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/anchor_rv_avatar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/liveModule/src/main/res/layout/activity_main.xml b/liveModule/src/main/res/layout/activity_main.xml
index 11a3b03..e85534a 100644
--- a/liveModule/src/main/res/layout/activity_main.xml
+++ b/liveModule/src/main/res/layout/activity_main.xml
@@ -9,7 +9,7 @@
android:layout_height="match_parent" />
- <android.support.v4.app.FragmentTabHost
+ <androidx.fragment.app.FragmentTabHost
android:id="@android:id/tabhost"
android:layout_gravity="bottom"
android:layout_width="match_parent"
diff --git a/liveModule/src/main/res/layout/activity_vod_play.xml b/liveModule/src/main/res/layout/activity_vod_play.xml
index 4edd4a8..1ad8d09 100644
--- a/liveModule/src/main/res/layout/activity_vod_play.xml
+++ b/liveModule/src/main/res/layout/activity_vod_play.xml
@@ -29,7 +29,7 @@
android:layout_width="110dp"
android:layout_height="35dp"/>
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/anchor_rv_avatar"
android:layout_marginRight="15dp"
android:layout_marginTop="5dp"
diff --git a/liveModule/src/main/res/layout/fragment_beauty_area.xml b/liveModule/src/main/res/layout/fragment_beauty_area.xml
index fb1ccfc..f0a1b43 100644
--- a/liveModule/src/main/res/layout/fragment_beauty_area.xml
+++ b/liveModule/src/main/res/layout/fragment_beauty_area.xml
@@ -175,7 +175,7 @@
android:gravity="center" />
</com.tencent.qcloud.xiaozhibo.common.widget.beauty.TCHorizontalScrollView>
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/material_recycler_view"
android:layout_width="match_parent"
android:layout_height="100dp"/>
diff --git a/liveModule/src/main/res/layout/fragment_videolist.xml b/liveModule/src/main/res/layout/fragment_videolist.xml
index 415bcdc..e2dcc37 100644
--- a/liveModule/src/main/res/layout/fragment_videolist.xml
+++ b/liveModule/src/main/res/layout/fragment_videolist.xml
@@ -80,7 +80,7 @@
</FrameLayout>
- <android.support.v4.widget.SwipeRefreshLayout
+ <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_refresh_layout_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -100,7 +100,7 @@
android:background="#efefef"
android:divider="@color/colorActivityBackground"
android:dividerHeight="5dp" />
- </android.support.v4.widget.SwipeRefreshLayout>
+ </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<TextView
diff --git a/liveModule/src/main/res/values/attrs.xml b/liveModule/src/main/res/values/attrs.xml
index 519481b..513bf68 100644
--- a/liveModule/src/main/res/values/attrs.xml
+++ b/liveModule/src/main/res/values/attrs.xml
@@ -17,7 +17,7 @@
<!-- 名称 -->
<attr name="name" format="string"/>
<!-- 内容或当前状态 -->
- <attr name="content" format="string"/>
+<!-- <attr name="content" format="string"/>-->
<!-- 是否是列表中最后一个 -->
<attr name="isBottom" format="boolean"/>
<!-- 是否可以跳转 -->
diff --git a/managercenter/src/main/java/com/dayu/managercenter/ui/activity/AllOrderActivity.java b/managercenter/src/main/java/com/dayu/managercenter/ui/activity/AllOrderActivity.java
index b315eaa..c8b82bd 100644
--- a/managercenter/src/main/java/com/dayu/managercenter/ui/activity/AllOrderActivity.java
+++ b/managercenter/src/main/java/com/dayu/managercenter/ui/activity/AllOrderActivity.java
@@ -1,12 +1,12 @@
package com.dayu.managercenter.ui.activity;
import android.content.Context;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
+import androidx.fragment.app.Fragment;
+
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.base.ui.adapter.FragmentBaseAdapter;
import com.dayu.managercenter.R;
@@ -15,6 +15,7 @@ import com.dayu.managercenter.databinding.ActivityAllOrderBinding;
import com.dayu.managercenter.ui.fragment.AllOrderFragment;
import com.dayu.utils.TabLayoutUtils;
import com.dayu.utils.UIUtils;
+import com.google.android.material.tabs.TabLayout;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/managercenter/src/main/java/com/dayu/managercenter/ui/activity/CreateOrderActivity.java b/managercenter/src/main/java/com/dayu/managercenter/ui/activity/CreateOrderActivity.java
index 9a63c90..dfbbfce 100644
--- a/managercenter/src/main/java/com/dayu/managercenter/ui/activity/CreateOrderActivity.java
+++ b/managercenter/src/main/java/com/dayu/managercenter/ui/activity/CreateOrderActivity.java
@@ -1,13 +1,19 @@
package com.dayu.managercenter.ui.activity;
+import static com.dayu.utils.UtilsDate.FORMAT_ONE;
+import static com.dayu.utils.UtilsDate.LONG_DATE;
+import static com.dayu.utils.UtilsDate.LONG_DATE_FORMAT;
+import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
+
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
-import android.support.v7.widget.GridLayoutManager;
import android.text.TextUtils;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+
import com.alibaba.android.arouter.facade.annotation.Route;
import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
import com.bigkoo.pickerview.builder.TimePickerBuilder;
@@ -37,7 +43,7 @@ import com.dayu.utils.UserManager;
import com.dayu.utils.UtilsDate;
import com.dayu.utils.UtilsUserAccountMatcher;
import com.google.gson.Gson;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia;
@@ -53,11 +59,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
-import static com.dayu.utils.UtilsDate.FORMAT_ONE;
-import static com.dayu.utils.UtilsDate.LONG_DATE;
-import static com.dayu.utils.UtilsDate.LONG_DATE_FORMAT;
-import static com.dayu.utils.UtilsDate.LONG_TIME_FORMAT_TWO;
-
/**
* Created by luofan
* on 2018/11/27.
@@ -502,7 +503,7 @@ public class CreateOrderActivity extends BaseActivity<CreateOrderPresenter, Acti
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
- List<LocalMedia> selectList = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> selectList = PictureSelector.obtainSelectorList(data);
if (selectList != null && selectList.size() > 0) {
mImages.remove("add");
for (int a = 0; a < selectList.size(); a++) {
diff --git a/managercenter/src/main/java/com/dayu/managercenter/ui/activity/PreviewActivty.java b/managercenter/src/main/java/com/dayu/managercenter/ui/activity/PreviewActivty.java
index b901783..9202f5f 100755
--- a/managercenter/src/main/java/com/dayu/managercenter/ui/activity/PreviewActivty.java
+++ b/managercenter/src/main/java/com/dayu/managercenter/ui/activity/PreviewActivty.java
@@ -1,11 +1,12 @@
package com.dayu.managercenter.ui.activity;
import android.content.Context;
-import android.support.v4.view.PagerAdapter;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
+import androidx.viewpager.widget.PagerAdapter;
+
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.common.Constants;
import com.dayu.managercenter.R;
diff --git a/managercenter/src/main/java/com/dayu/managercenter/ui/activity/SendOrderDetailActivity.java b/managercenter/src/main/java/com/dayu/managercenter/ui/activity/SendOrderDetailActivity.java
index c21156b..d945a54 100644
--- a/managercenter/src/main/java/com/dayu/managercenter/ui/activity/SendOrderDetailActivity.java
+++ b/managercenter/src/main/java/com/dayu/managercenter/ui/activity/SendOrderDetailActivity.java
@@ -3,10 +3,11 @@ package com.dayu.managercenter.ui.activity;
import android.content.Intent;
import android.graphics.Color;
import android.os.CountDownTimer;
-import android.support.v7.widget.LinearLayoutManager;
import android.view.View;
import android.widget.TextView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.alibaba.android.arouter.facade.annotation.Route;
import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
diff --git a/managercenter/src/main/java/com/dayu/managercenter/ui/adapter/GrabOrderAdapter.java b/managercenter/src/main/java/com/dayu/managercenter/ui/adapter/GrabOrderAdapter.java
index 50819a4..621e341 100644
--- a/managercenter/src/main/java/com/dayu/managercenter/ui/adapter/GrabOrderAdapter.java
+++ b/managercenter/src/main/java/com/dayu/managercenter/ui/adapter/GrabOrderAdapter.java
@@ -2,9 +2,10 @@ package com.dayu.managercenter.ui.adapter;
import android.graphics.Color;
import android.os.CountDownTimer;
-import android.support.annotation.NonNull;
import android.view.View;
+import androidx.annotation.NonNull;
+
import com.dayu.base.ui.adapter.BaseViewHolder;
import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.managercenter.R;
diff --git a/managercenter/src/main/java/com/dayu/managercenter/ui/fragment/GrabOrderFragment.java b/managercenter/src/main/java/com/dayu/managercenter/ui/fragment/GrabOrderFragment.java
index 5f47a2f..51cb7ad 100644
--- a/managercenter/src/main/java/com/dayu/managercenter/ui/fragment/GrabOrderFragment.java
+++ b/managercenter/src/main/java/com/dayu/managercenter/ui/fragment/GrabOrderFragment.java
@@ -1,8 +1,9 @@
package com.dayu.managercenter.ui.fragment;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
+
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
import com.dayu.base.ui.adapter.FragmentAdapter;
import com.dayu.base.ui.fragment.DataBindingFragment;
diff --git a/managercenter/src/main/java/com/dayu/managercenter/ui/fragment/ManagerFragment.java b/managercenter/src/main/java/com/dayu/managercenter/ui/fragment/ManagerFragment.java
index a90fa85..aaf9778 100644
--- a/managercenter/src/main/java/com/dayu/managercenter/ui/fragment/ManagerFragment.java
+++ b/managercenter/src/main/java/com/dayu/managercenter/ui/fragment/ManagerFragment.java
@@ -2,10 +2,10 @@ package com.dayu.managercenter.ui.fragment;
import android.content.Intent;
import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
import android.view.View;
+import androidx.fragment.app.Fragment;
+
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.ui.adapter.FragmentBaseAdapter;
import com.dayu.base.ui.fragment.DataBindingFragment;
@@ -22,6 +22,7 @@ import com.dayu.utils.AppManager;
import com.dayu.utils.StationManager;
import com.dayu.utils.TabLayoutUtils;
import com.dayu.utils.UserManager;
+import com.google.android.material.tabs.TabLayout;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
diff --git a/managercenter/src/main/res/layout/activity_all_order.xml b/managercenter/src/main/res/layout/activity_all_order.xml
index ef37887..c48616c 100644
--- a/managercenter/src/main/res/layout/activity_all_order.xml
+++ b/managercenter/src/main/res/layout/activity_all_order.xml
@@ -91,7 +91,7 @@
</RelativeLayout>
- <android.support.design.widget.TabLayout
+ <com.google.android.material.tabs.TabLayout
android:id="@+id/tab"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
@@ -105,7 +105,7 @@
<ImageView style="@style/line" />
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
diff --git a/managercenter/src/main/res/layout/activity_create_order_layout.xml b/managercenter/src/main/res/layout/activity_create_order_layout.xml
index 4083ba4..08a5521 100644
--- a/managercenter/src/main/res/layout/activity_create_order_layout.xml
+++ b/managercenter/src/main/res/layout/activity_create_order_layout.xml
@@ -20,7 +20,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -31,9 +31,9 @@
<TextView
android:id="@+id/tv_title"
style="@style/toolbar_title" />
- </android.support.v7.widget.Toolbar>
+ </androidx.appcompat.widget.Toolbar>
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -74,7 +74,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
- <android.support.v7.widget.AppCompatRadioButton
+ <androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/other_customer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -83,7 +83,7 @@
android:text="@string/other_customer"
android:theme="@style/MyRadioButton" />
- <android.support.v7.widget.AppCompatRadioButton
+ <androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/sign_customer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -174,7 +174,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
- <android.support.v7.widget.AppCompatRadioButton
+ <androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/personal_customer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -183,7 +183,7 @@
android:text="@string/personal_customer"
android:theme="@style/MyRadioButton" />
- <android.support.v7.widget.AppCompatRadioButton
+ <androidx.appcompat.widget.AppCompatRadioButton
android:id="@+id/enterprise_customer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -871,7 +871,7 @@
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_15" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/photoView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -993,6 +993,6 @@
android:textSize="18sp" />
</LinearLayout>
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
</LinearLayout>
</layout>
\ No newline at end of file
diff --git a/managercenter/src/main/res/layout/activity_pic_preview.xml b/managercenter/src/main/res/layout/activity_pic_preview.xml
index 5a60afa..72e5a11 100644
--- a/managercenter/src/main/res/layout/activity_pic_preview.xml
+++ b/managercenter/src/main/res/layout/activity_pic_preview.xml
@@ -23,13 +23,13 @@
style="@style/title_image_back"/>
</RelativeLayout>
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/vp_preview"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/cl_order_text_one"
android:unselectedAlpha="1">
- </android.support.v4.view.ViewPager>
+ </androidx.viewpager.widget.ViewPager>
</LinearLayout>
</layout>
\ No newline at end of file
diff --git a/managercenter/src/main/res/layout/activity_preview.xml b/managercenter/src/main/res/layout/activity_preview.xml
index e63b13d..463dd95 100644
--- a/managercenter/src/main/res/layout/activity_preview.xml
+++ b/managercenter/src/main/res/layout/activity_preview.xml
@@ -20,7 +20,7 @@
style="@style/title_image_back" />
</RelativeLayout>
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/vp_preview"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
diff --git a/managercenter/src/main/res/layout/activity_send_detail.xml b/managercenter/src/main/res/layout/activity_send_detail.xml
index 44fb6f2..a3e8b9a 100644
--- a/managercenter/src/main/res/layout/activity_send_detail.xml
+++ b/managercenter/src/main/res/layout/activity_send_detail.xml
@@ -23,11 +23,11 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <android.support.v7.widget.Toolbar
+ <Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
- android:background="@color/white"
+ android:background="@color/cl_white"
app:layout_scrollFlags="scroll|enterAlwaysCollapsed|snap">
<TextView
@@ -38,11 +38,11 @@
android:textColor="@color/cl_home_title_text_color"
android:textSize="16sp"
android:textStyle="bold" />
- </android.support.v7.widget.Toolbar>
+ </Toolbar>
<ImageView style="@style/card_line" />
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:id="@+id/nv_top"
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -164,7 +164,7 @@
android:textSize="14sp"
android:visibility="gone" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_server_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -510,7 +510,7 @@
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
<LinearLayout
android:layout_width="match_parent"
diff --git a/managercenter/src/main/res/layout/activity_service_station.xml b/managercenter/src/main/res/layout/activity_service_station.xml
index c216bca..a788999 100644
--- a/managercenter/src/main/res/layout/activity_service_station.xml
+++ b/managercenter/src/main/res/layout/activity_service_station.xml
@@ -13,7 +13,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -28,7 +28,7 @@
android:textColor="@color/cl_home_title_text_color"
android:textSize="16sp"
android:textStyle="bold" />
- </android.support.v7.widget.Toolbar>
+ </androidx.appcompat.widget.Toolbar>
<ImageView style="@style/card_line" />
diff --git a/managercenter/src/main/res/layout/activity_sub_order_detail.xml b/managercenter/src/main/res/layout/activity_sub_order_detail.xml
index 6ab1b06..f549ae7 100644
--- a/managercenter/src/main/res/layout/activity_sub_order_detail.xml
+++ b/managercenter/src/main/res/layout/activity_sub_order_detail.xml
@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -34,11 +34,11 @@
android:textColor="@color/cl_home_title_text_color"
android:textSize="16sp"
android:textStyle="bold" />
- </android.support.v7.widget.Toolbar>
+ </androidx.appcompat.widget.Toolbar>
<ImageView style="@style/card_line" />
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:id="@+id/nv_top"
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -417,7 +417,7 @@
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
<LinearLayout
android:id="@+id/ll_manager"
diff --git a/managercenter/src/main/res/layout/fragment_grab_order.xml b/managercenter/src/main/res/layout/fragment_grab_order.xml
index 8358fa7..1f742b8 100644
--- a/managercenter/src/main/res/layout/fragment_grab_order.xml
+++ b/managercenter/src/main/res/layout/fragment_grab_order.xml
@@ -31,7 +31,7 @@
android:textSize="15sp" />
</LinearLayout>
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/vp_grab"
android:layout_marginTop="10dp"
android:layout_width="match_parent"
diff --git a/managercenter/src/main/res/layout/fragment_manager.xml b/managercenter/src/main/res/layout/fragment_manager.xml
index 14a1c1c..ffba310 100755
--- a/managercenter/src/main/res/layout/fragment_manager.xml
+++ b/managercenter/src/main/res/layout/fragment_manager.xml
@@ -37,7 +37,7 @@
android:textSize="@dimen/dp_13.3" />
</RelativeLayout>
- <android.support.design.widget.TabLayout
+ <com.google.android.material.tabs.TabLayout
android:id="@+id/tab"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
@@ -51,7 +51,7 @@
<ImageView style="@style/line" />
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/messageCenter/src/main/java/com/dayu/message/ui/activity/TestActivity.java b/messageCenter/src/main/java/com/dayu/message/ui/activity/TestActivity.java
index 7a05e78..b9d6a9f 100644
--- a/messageCenter/src/main/java/com/dayu/message/ui/activity/TestActivity.java
+++ b/messageCenter/src/main/java/com/dayu/message/ui/activity/TestActivity.java
@@ -1,10 +1,11 @@
package com.dayu.message.ui.activity;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
import android.view.Window;
import android.view.WindowManager;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.dayu.message.R;
import com.dayu.message.ui.fragment.HomeMessageFragment;
diff --git a/messageCenter/src/main/java/com/dayu/message/ui/fragment/HomeMessageFragment.java b/messageCenter/src/main/java/com/dayu/message/ui/fragment/HomeMessageFragment.java
index 1905fb9..4ba55f5 100644
--- a/messageCenter/src/main/java/com/dayu/message/ui/fragment/HomeMessageFragment.java
+++ b/messageCenter/src/main/java/com/dayu/message/ui/fragment/HomeMessageFragment.java
@@ -1,8 +1,8 @@
package com.dayu.message.ui.fragment;
import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
+
+import androidx.fragment.app.Fragment;
import com.dayu.base.ui.adapter.FragmentBaseAdapter;
import com.dayu.base.ui.fragment.BaseFragment;
@@ -15,6 +15,7 @@ import com.dayu.provider.event.RefreshHxNum;
import com.dayu.utils.SPUtils;
import com.dayu.utils.TabLayoutUtils;
import com.dayu.utils.UIUtils;
+import com.google.android.material.tabs.TabLayout;
import org.greenrobot.eventbus.EventBus;
diff --git a/messageCenter/src/main/res/layout/fragment_message.xml b/messageCenter/src/main/res/layout/fragment_message.xml
index f3dba9d..bf20471 100755
--- a/messageCenter/src/main/res/layout/fragment_message.xml
+++ b/messageCenter/src/main/res/layout/fragment_message.xml
@@ -24,7 +24,7 @@
</RelativeLayout>
- <android.support.design.widget.TabLayout
+ <com.google.android.material.tabs.TabLayout
android:id="@+id/tb_message"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_40"
@@ -37,7 +37,7 @@
<ImageView style="@style/line" />
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/vp_message"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/messageCenter/src/main/res/layout/fragment_message1.xml b/messageCenter/src/main/res/layout/fragment_message1.xml
index 96de7aa..9565b33 100755
--- a/messageCenter/src/main/res/layout/fragment_message1.xml
+++ b/messageCenter/src/main/res/layout/fragment_message1.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
- <android.support.design.widget.CoordinatorLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+ <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <android.support.design.widget.AppBarLayout
+ <com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -24,9 +24,9 @@
android:textColor="@color/cl_home_title_text_color"
android:textSize="16sp"
android:textStyle="bold" />
- </android.support.v7.widget.Toolbar>
+ </androidx.appcompat.widget.Toolbar>
- <android.support.design.widget.TabLayout
+ <com.google.android.material.tabs.TabLayout
android:id="@+id/tb_message"
android:layout_width="match_parent"
android:layout_height="45dp"
@@ -36,14 +36,14 @@
app:tabTextAppearance="@style/TabLayoutTextStyle"
app:tabTextColor="@color/cl_tab_line" />
- </android.support.design.widget.AppBarLayout>
+ </com.google.android.material.appbar.AppBarLayout>
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/vp_message"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="8dp"
android:background="@color/cl_white"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
- </android.support.design.widget.CoordinatorLayout>
+ </androidx.coordinatorlayout.widget.CoordinatorLayout>
</layout>
\ No newline at end of file
diff --git a/orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java b/orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java
index 35e6f6b..a1e35f2 100644
--- a/orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/multiprocessorder/MultiProcessOrderPresenter.java
@@ -23,7 +23,7 @@ import com.dayu.order.ui.activity.ServerInstructionActivity;
import com.dayu.order.ui.activity.SopWebViewActivity;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UserManager;
-import com.luck.picture.lib.tools.PictureFileUtils;
+import com.luck.picture.lib.utils.PictureFileUtils;
import org.json.JSONObject;
@@ -100,7 +100,7 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
private void commitOrder(List<String> list, List<String> snList, String videoUrl) {
commitOrder(list, snList, mSpu.getId(), mInfo.get(), videoUrl);
- PictureFileUtils.deleteCacheDirFile(BaseApplication.getContext());
+ PictureFileUtils.deleteAllCacheDirFile(BaseApplication.getContext());
}
private MultipartBody.Part[] packPhoto(List<String> imageUrl) {
@@ -193,7 +193,7 @@ public class MultiProcessOrderPresenter extends MultiProcessOrderContract.Presen
mView.dumpBack();
}
}
- PictureFileUtils.deleteCacheDirFile(BaseApplication.getContext());
+ PictureFileUtils.deleteAllCacheDirFile(BaseApplication.getContext());
}
private void doNextOrder(Spu spu) {
diff --git a/orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java b/orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java
index ae21562..74e2bf2 100644
--- a/orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java
+++ b/orderCenter/src/main/java/com/dayu/order/presenter/processorder/ProcessOrderPresenter.java
@@ -29,7 +29,7 @@ import com.dayu.utils.ProgressUtil;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
-import com.luck.picture.lib.tools.PictureFileUtils;
+import com.luck.picture.lib.utils.PictureFileUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.greendao.query.Query;
@@ -208,7 +208,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
}
EventBus.getDefault().post(new OrderState(status, mPosition));
mOrderInfoDao.deleteByKey((long) orderId);
- PictureFileUtils.deleteCacheDirFile(BaseApplication.getContext());
+ PictureFileUtils.deleteAllCacheDirFile(BaseApplication.getContext());
File file = new File(mPath);
if (file.exists()) {
file.delete();
@@ -239,7 +239,7 @@ public class ProcessOrderPresenter extends ProcessOrderContract.Presenter {
mAccountId, isPay, info.getDoorPrice(), info.getOtherInfo(),
info.getServerPrice(), info.getMaterialCost(), info.getOtherPrice(), info.getBrandName(), info.getProductModel(), info.getSn(), Integer.parseInt(info.getPayer()));
mImages.clear();
- PictureFileUtils.deleteCacheDirFile(BaseApplication.getContext());
+ PictureFileUtils.deleteAllCacheDirFile(BaseApplication.getContext());
}
private MultipartBody.Part[] packPhoto(List<String> imageUrl) {
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/activity/KnowledgeDetailActivity.java b/orderCenter/src/main/java/com/dayu/order/ui/activity/KnowledgeDetailActivity.java
index a928ca3..f40464a 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/KnowledgeDetailActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/KnowledgeDetailActivity.java
@@ -7,7 +7,8 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.net.Uri;
import android.os.Environment;
-import android.support.v7.widget.LinearLayoutManager;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.chad.library.adapter.base.BaseQuickAdapter;
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/activity/MultiProcessOrderActivity.java b/orderCenter/src/main/java/com/dayu/order/ui/activity/MultiProcessOrderActivity.java
index c8fb70c..9429607 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/MultiProcessOrderActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/MultiProcessOrderActivity.java
@@ -3,14 +3,15 @@ package com.dayu.order.ui.activity;
import android.Manifest;
import android.annotation.SuppressLint;
import android.content.Intent;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import android.widget.EditText;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.base.ui.activity.BaseActivity;
@@ -31,8 +32,10 @@ import com.dayu.utils.ToastUtils;
import com.dayu.widgets.TextDialog;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelectionCameraModel;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
+import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;
import org.greenrobot.eventbus.Subscribe;
@@ -138,7 +141,7 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
if (pos == 0) {
recordVideo();
} else {
- MediaChooseUtils.chooseOneVideo(this, 10, 5, PictureConfig.TYPE_VIDEO);
+ MediaChooseUtils.chooseOneVideo(this, 10, 5, SelectMimeType.TYPE_VIDEO);
}
});
}
@@ -152,15 +155,18 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
@SuppressLint("CheckResult")
@Override
public void onPermissionGranted() {
- Observable.timer(1000, TimeUnit.MILLISECONDS)
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(aLong -> {
- Intent intent = new Intent(MultiProcessOrderActivity.this, CameraActivity.class);
- intent.putExtra(Constants.ONLY_VIDEO, true);
- intent.putExtra(Constants.MIN_TIME, 5 * 1000);
- intent.putExtra(Constants.MAX_TIME, 10 * 1000);
- startActivityForResult(intent, Constants.CAMERA_CODE);
- });
+// Observable.timer(1000, TimeUnit.MILLISECONDS)
+// .observeOn(AndroidSchedulers.mainThread())
+// .subscribe(aLong -> {
+// Intent intent = new Intent(MultiProcessOrderActivity.this, CameraActivity.class);
+// intent.putExtra(Constants.ONLY_VIDEO, true);
+// intent.putExtra(Constants.MIN_TIME, 5 * 1000);
+// intent.putExtra(Constants.MAX_TIME, 10 * 1000);
+// startActivityForResult(intent, Constants.CAMERA_CODE);
+// });
+ PictureSelectionCameraModel pictureSelectionCameraModel = PictureSelector.create(MultiProcessOrderActivity.this)
+ .openCamera(SelectMimeType.ofVideo());
+ pictureSelectionCameraModel.forResultActivity(1002);
}
@Override
@@ -238,7 +244,7 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
- List<LocalMedia> selectList = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> selectList = PictureSelector.obtainSelectorList(data);
if (selectList != null && selectList.size() > 0) {
mImages.remove("add");
for (int a = 0; a < selectList.size(); a++) {
@@ -255,10 +261,26 @@ public class MultiProcessOrderActivity extends BaseActivity<MultiProcessOrderPre
mAdapter.setData(mImages);
}
break;
- case PictureConfig.TYPE_VIDEO:
- List<LocalMedia> mSelectList = PictureSelector.obtainMultipleResult(data);
+ case 1002:
+ List<LocalMedia> mSelectList = PictureSelector.obtainSelectorList(data);
if (mSelectList != null) {
videoPath = mSelectList.get(0).getPath();
+ if (videoPath.contains("content")){
+ videoPath = mSelectList.get(0).getRealPath();
+ }
+ File file = new File(videoPath);
+ if (file.length() > 500 * 1024 * 1024) {
+ showToast("视频文件不能大于500M");
+ videoPath = "";
+ } else {
+ setVideoView();
+ }
+ }
+ break;
+ case SelectMimeType.TYPE_VIDEO:
+ List<LocalMedia> mSelectList1 = PictureSelector.obtainSelectorList(data);
+ if (mSelectList1 != null) {
+ videoPath = mSelectList1.get(0).getPath();
File file = new File(videoPath);
if (file.length() > 500 * 1024 * 1024) {
showToast("视频文件不能大于500M");
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java b/orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
index bfed0ba..f63aabe 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/MultipleProcessActivity.java
@@ -4,8 +4,6 @@ import android.content.Intent;
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
import android.text.Editable;
import android.text.TextUtils;
import android.view.LayoutInflater;
@@ -16,6 +14,9 @@ import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
import com.bigkoo.pickerview.view.OptionsPickerView;
import com.dayu.base.ui.activity.BaseActivity;
@@ -33,7 +34,7 @@ import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.listener.OnCloseListener;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia;
@@ -215,7 +216,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
mWechatPay.setTextColor(getResources().getColor(R.color.cl_tab_init));
mPublicPay.setTextColor(getResources().getColor(R.color.cl_tab_init));
tv.setBackgroundResource(R.drawable.blue_commom);
- tv.setTextColor(getResources().getColor(R.color.white));
+ tv.setTextColor(getResources().getColor(R.color.cl_white));
}
@Override
@@ -229,15 +230,15 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
mWechatPay.setTextColor(getResources().getColor(R.color.cl_tab_init));
if (payType == 1) {
mWechatPay.setBackgroundResource(R.drawable.blue_commom);
- mWechatPay.setTextColor(getResources().getColor(R.color.white));
+ mWechatPay.setTextColor(getResources().getColor(R.color.cl_white));
mRlPay.setVisibility(View.VISIBLE);
} else if (payType == 2) {
mCashPay.setBackgroundResource(R.drawable.blue_commom);
- mCashPay.setTextColor(getResources().getColor(R.color.white));
+ mCashPay.setTextColor(getResources().getColor(R.color.cl_white));
mRlPay.setVisibility(View.VISIBLE);
} else {
mNoPay.setBackgroundResource(R.drawable.blue_commom);
- mNoPay.setTextColor(getResources().getColor(R.color.white));
+ mNoPay.setTextColor(getResources().getColor(R.color.cl_white));
mRlPay.setVisibility(View.GONE);
}
}
@@ -551,7 +552,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
- mSelectList = PictureSelector.obtainMultipleResult(data);
+ mSelectList = PictureSelector.obtainSelectorList(data);
mPayerImages.remove("add");
for (int a = 0; a < mSelectList.size(); a++) {
if (!TextUtils.isEmpty(mSelectList.get(a).getCompressPath())) {
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsActivity.java b/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsActivity.java
index 91b1e36..8355d17 100755
--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderDetailsActivity.java
@@ -1,10 +1,11 @@
package com.dayu.order.ui.activity;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
import android.view.View;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
import com.alibaba.android.arouter.facade.annotation.Route;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.common.Constants;
@@ -111,28 +112,28 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailPresenter, Act
@Override
public void initBtn() {
mBind.btnDetail.setSelected(true);
- mBind.btnDetail.setTextColor(getResources().getColor(R.color.white));
+ mBind.btnDetail.setTextColor(getResources().getColor(R.color.cl_white));
mBind.btnDetail.setOnClickListener((view) -> {
reSelected();
mBind.btnDetail.setSelected(true);
- mBind.btnDetail.setTextColor(getResources().getColor(R.color.white));
+ mBind.btnDetail.setTextColor(getResources().getColor(R.color.cl_white));
showHideFragment(0, mPosition);
});
mBind.btnOperate.setOnClickListener((view) -> {
reSelected();
mBind.btnOperate.setSelected(true);
- mBind.btnOperate.setTextColor(getResources().getColor(R.color.white));
+ mBind.btnOperate.setTextColor(getResources().getColor(R.color.cl_white));
showHideFragment(1, mPosition);
});
mBind.btnServer.setOnClickListener((view) -> {
reSelected();
- mBind.btnServer.setTextColor(getResources().getColor(R.color.white));
+ mBind.btnServer.setTextColor(getResources().getColor(R.color.cl_white));
mBind.btnServer.setSelected(true);
showHideFragment(2, mPosition);
});
mBind.btnPart.setOnClickListener((view) -> {
reSelected();
- mBind.btnPart.setTextColor(getResources().getColor(R.color.white));
+ mBind.btnPart.setTextColor(getResources().getColor(R.color.cl_white));
mBind.btnPart.setSelected(true);
showHideFragment(3, mPosition);
});
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartReceiveActivity.java b/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartReceiveActivity.java
index ef43004..150e1dd 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartReceiveActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartReceiveActivity.java
@@ -1,12 +1,13 @@
package com.dayu.order.ui.activity;
import android.content.Intent;
-import android.support.v7.widget.GridLayoutManager;
import android.text.TextUtils;
import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.adapter.PhotoViewAdapter;
import com.dayu.base.ui.adapter.SpacesItemDecoration;
@@ -17,7 +18,7 @@ import com.dayu.order.databinding.ActivityOrderPartReceiveBinding;
import com.dayu.order.presenter.orderpart_receive.PartReceiveContract;
import com.dayu.order.presenter.orderpart_receive.PartRecievePresenter;
import com.dayu.utils.CommonUtils;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia;
@@ -78,7 +79,7 @@ public class OrderPartReceiveActivity extends BaseActivity<PartRecievePresenter,
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
- List<LocalMedia> selectList = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> selectList = PictureSelector.obtainSelectorList(data);
if (selectList != null && selectList.size() > 0) {
mImages.remove("add");
for (int a = 0; a < selectList.size(); a++) {
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartSendActivity.java b/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartSendActivity.java
index 318b50d..8809a49 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartSendActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/OrderPartSendActivity.java
@@ -1,12 +1,13 @@
package com.dayu.order.ui.activity;
import android.content.Intent;
-import android.support.v7.widget.GridLayoutManager;
import android.text.TextUtils;
import android.view.MotionEvent;
import android.view.View;
import android.view.WindowManager;
+import androidx.recyclerview.widget.GridLayoutManager;
+
import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
import com.bigkoo.pickerview.listener.OnOptionsSelectListener;
import com.bigkoo.pickerview.view.OptionsPickerView;
@@ -22,7 +23,7 @@ import com.dayu.order.presenter.orderpart_send.PartSendPresenter;
import com.dayu.utils.UIUtils;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia;
@@ -146,7 +147,7 @@ public class OrderPartSendActivity extends BaseActivity<PartSendPresenter, Activ
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
- List<LocalMedia> selectList = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> selectList = PictureSelector.obtainSelectorList(data);
if (selectList != null && selectList.size() > 0) {
mImages.remove("add");
for (int a = 0; a < selectList.size(); a++) {
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/activity/PreviewActivty.java b/orderCenter/src/main/java/com/dayu/order/ui/activity/PreviewActivty.java
index ff03fe2..75bfab4 100755
--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/PreviewActivty.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/PreviewActivty.java
@@ -1,11 +1,12 @@
package com.dayu.order.ui.activity;
import android.content.Context;
-import android.support.v4.view.PagerAdapter;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
+import androidx.viewpager.widget.PagerAdapter;
+
import com.dayu.base.ui.activity.DataBindingActivity;
import com.dayu.common.Constants;
import com.dayu.order.R;
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/activity/ProcessOrderActivity.java b/orderCenter/src/main/java/com/dayu/order/ui/activity/ProcessOrderActivity.java
index d132edb..9a1e3e1 100755
--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/ProcessOrderActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/ProcessOrderActivity.java
@@ -5,12 +5,13 @@ import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.os.Environment;
-import android.support.v7.widget.GridLayoutManager;
import android.text.Editable;
import android.text.TextUtils;
import android.view.View;
import android.widget.TextView;
+import androidx.recyclerview.widget.GridLayoutManager;
+
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.adapter.PhotoViewAdapter;
import com.dayu.base.ui.adapter.SpacesItemDecoration;
@@ -29,7 +30,7 @@ import com.dayu.utils.ToastUtils;
import com.dayu.utils.UIUtils;
import com.google.zxing.integration.android.IntentIntegrator;
import com.google.zxing.integration.android.IntentResult;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia;
@@ -131,7 +132,7 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
mBind.cashPay.setTextColor(getResources().getColor(R.color.cl_tab_init));
mBind.wechatPay.setTextColor(getResources().getColor(R.color.cl_tab_init));
tv.setBackgroundResource(R.drawable.blue_commom);
- tv.setTextColor(getResources().getColor(R.color.white));
+ tv.setTextColor(getResources().getColor(R.color.cl_white));
}
private void initTotal() {
@@ -291,15 +292,15 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
mBind.wechatPay.setTextColor(getResources().getColor(R.color.cl_tab_init));
if (payType == 1) {
mBind.wechatPay.setBackgroundResource(R.drawable.blue_commom);
- mBind.wechatPay.setTextColor(getResources().getColor(R.color.white));
+ mBind.wechatPay.setTextColor(getResources().getColor(R.color.cl_white));
mBind.rlPay.setVisibility(View.VISIBLE);
} else if (payType == 2) {
mBind.cashPay.setBackgroundResource(R.drawable.blue_commom);
- mBind.cashPay.setTextColor(getResources().getColor(R.color.white));
+ mBind.cashPay.setTextColor(getResources().getColor(R.color.cl_white));
mBind.rlPay.setVisibility(View.VISIBLE);
} else {
mBind.noPay.setBackgroundResource(R.drawable.blue_commom);
- mBind.noPay.setTextColor(getResources().getColor(R.color.white));
+ mBind.noPay.setTextColor(getResources().getColor(R.color.cl_white));
mBind.rlPay.setVisibility(View.GONE);
}
}
@@ -364,7 +365,7 @@ public class ProcessOrderActivity extends BaseActivity<ProcessOrderPresenter, Ac
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
- mSelectList = PictureSelector.obtainMultipleResult(data);
+ mSelectList = PictureSelector.obtainSelectorList(data);
if (mSelectList != null && mSelectList.size() > 0) {
if (mPhotoState == 0) {
mImages.remove("add");
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/activity/SopLocalActivity.java b/orderCenter/src/main/java/com/dayu/order/ui/activity/SopLocalActivity.java
index 3e08274..44ba095 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/SopLocalActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/SopLocalActivity.java
@@ -11,8 +11,8 @@ import android.location.Address;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
import android.text.TextUtils;
+import android.util.Log;
import android.view.View;
import android.webkit.ValueCallback;
import android.webkit.WebChromeClient;
@@ -20,6 +20,8 @@ import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.LinearLayout;
+import androidx.recyclerview.widget.GridLayoutManager;
+
import com.cjt2325.cameralibrary.util.ScreenUtils;
import com.dayu.base.api.Api;
import com.dayu.base.api.BaseApiFactory;
@@ -30,7 +32,6 @@ import com.dayu.base.ui.adapter.MediaChooseAdapter;
import com.dayu.base.ui.adapter.SpacesItemDecoration;
import com.dayu.base.ui.presenter.SImplePresenter;
import com.dayu.common.Constants;
-import com.dayu.location.base.LocationUtils;
import com.dayu.location.base.LocationUtils1;
import com.dayu.order.R;
import com.dayu.order.api.OrderService;
@@ -48,8 +49,10 @@ import com.dayu.utils.ProgressUtil;
import com.dayu.utils.ToastUtils;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.TextDialog;
-import com.luck.picture.lib.PictureSelector;
-import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.basic.PictureSelectionCameraModel;
+import com.luck.picture.lib.basic.PictureSelectionSystemModel;
+import com.luck.picture.lib.basic.PictureSelector;
+import com.luck.picture.lib.config.SelectMimeType;
import com.luck.picture.lib.entity.LocalMedia;
import com.tbruyelle.rxpermissions2.RxPermissions;
@@ -525,7 +528,7 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
private void setImgAdapter() {
isChooseImg = true;
mAdapter = new MediaChooseAdapter(this, mImages,
- 3, PictureMimeType.ofImage(), true);
+ 3, SelectMimeType.ofImage(), true);
mAdapter.setCanEdit(canEdit);
mAdapter.setRequestCode(1001);
mBind.photo.setAdapter(mAdapter);
@@ -536,7 +539,7 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
private void setVideoAdapter() {
isChooseImg = false;
mAdapter = new MediaChooseAdapter(this, mVideos,
- 1, PictureMimeType.ofVideo(), true);
+ 1, SelectMimeType.ofVideo(), true);
mAdapter.setCanEdit(canEdit);
mAdapter.setShowCamera(false);
mAdapter.setRequestCode(1002);
@@ -565,16 +568,16 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
//选择视频弹框
private void showVideoDailog() {
- List<String> list = new ArrayList<>();
- list.add("拍摄");
- list.add("从本地选择");
- TextDialog.getInstance().showBottomDialog(mActivity, list, pos -> {
- if (pos == 0) {
- recordVideo();
- } else {
+// List<String> list = new ArrayList<>();
+// list.add("拍摄");
+// list.add("从本地选择");
+// TextDialog.getInstance().showBottomDialog(mActivity, list, pos -> {
+// if (pos == 0) {
+// recordVideo();
+// } else {
mAdapter.showPicDialog();
- }
- });
+// }
+// });
}
//录制视频
@@ -585,14 +588,19 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
@SuppressLint("CheckResult")
@Override
public void onPermissionGranted() {
- Observable.timer(1000, TimeUnit.MILLISECONDS)
- .observeOn(AndroidSchedulers.mainThread())
- .subscribe(aLong -> {
- Intent intent = new Intent(SopLocalActivity.this, CameraActivity.class);
- intent.putExtra(Constants.ONLY_VIDEO, true);
- intent.putExtra(Constants.IS_SOP_VIDEO, true);
- startActivityForResult(intent, Constants.CAMERA_CODE);
- });
+// Observable.timer(1000, TimeUnit.MILLISECONDS)
+// .observeOn(AndroidSchedulers.mainThread())
+// .subscribe(aLong -> {
+// Intent intent = new Intent(SopLocalActivity.this, CameraActivity.class);
+// intent.putExtra(Constants.ONLY_VIDEO, true);
+// intent.putExtra(Constants.IS_SOP_VIDEO, true);
+// startActivityForResult(intent, Constants.CAMERA_CODE);
+// });
+
+
+ PictureSelectionCameraModel pictureSelectionCameraModel = PictureSelector.create(SopLocalActivity.this)
+ .openCamera(SelectMimeType.ofVideo());
+ pictureSelectionCameraModel.forResultActivity(1002);
}
@Override
@@ -726,14 +734,18 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
if (resultCode == RESULT_OK) {
switch (requestCode) {
case 1001:
- List<LocalMedia> selectList = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> selectList = PictureSelector.obtainSelectorList(data);
if (selectList != null && selectList.size() > 0) {
mImages.remove("add");
for (int a = 0; a < selectList.size(); a++) {
if (!TextUtils.isEmpty(selectList.get(a).getCompressPath())) {
mImages.add(selectList.get(a).getCompressPath());
} else {
- mImages.add(selectList.get(a).getPath());
+ String path = selectList.get(a).getPath();
+ if (path.contains("content")){
+ path = selectList.get(a).getRealPath();
+ }
+ mImages.add(path);
}
}
mAdapter.setData(mImages);
@@ -741,9 +753,12 @@ public class SopLocalActivity extends BaseActivity<SImplePresenter, ActivitySopL
}
break;
case 1002:
- List<LocalMedia> mSelectList = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> mSelectList = PictureSelector.obtainSelectorList(data);
if (mSelectList != null) {
String videoPath = mSelectList.get(0).getPath();
+ if (videoPath.contains("content")){
+ videoPath = mSelectList.get(0).getRealPath();
+ }
File file = new File(videoPath);
if (file.length() > 100 * 1024 * 1024) {
showToast("视频文件不能大于100M");
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/activity/SopWebViewActivity.java b/orderCenter/src/main/java/com/dayu/order/ui/activity/SopWebViewActivity.java
index 5374a67..13e47e9 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/SopWebViewActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/SopWebViewActivity.java
@@ -1,5 +1,7 @@
package com.dayu.order.ui.activity;
+import static com.dayu.order.common.OrderConstant.ORDER_SOP_FINISH;
+
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
@@ -29,7 +31,7 @@ import com.dayu.utils.UserManager;
import com.github.lzyzsd.jsbridge.BridgeHandler;
import com.github.lzyzsd.jsbridge.BridgeWebView;
import com.github.lzyzsd.jsbridge.CallBackFunction;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia;
@@ -41,8 +43,6 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import static com.dayu.order.common.OrderConstant.ORDER_SOP_FINISH;
-
/**
* Created by luofan
@@ -294,8 +294,9 @@ public class SopWebViewActivity extends BaseActivity<SopPresenter, ActivitySopWe
// } else if (requestCode == RESULT_CODE_FOR_Lollipop) {
// onActivityResultAboveL(intent, resultCode);
// }
+ super.onActivityResult(requestCode, resultCode, intent);
if (resultCode == RESULT_OK && requestCode == PictureConfig.CHOOSE_REQUEST) {
- List<LocalMedia> list = PictureSelector.obtainMultipleResult(intent);
+ List<LocalMedia> list = PictureSelector.obtainSelectorList(intent);
Uri uri = null;
if (list != null) {
uri = Uri.fromFile(new File(list.get(0).getCompressPath()));
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/activity/TestActivity.java b/orderCenter/src/main/java/com/dayu/order/ui/activity/TestActivity.java
index 12bd73a..e6da4c1 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/activity/TestActivity.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/activity/TestActivity.java
@@ -1,10 +1,11 @@
package com.dayu.order.ui.activity;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
import android.view.Window;
import android.view.WindowManager;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.dayu.order.R;
import com.dayu.order.ui.fragment.HomeOrderFragment;
import com.dayu.utils.UserManager;
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java b/orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java
index c4d2a30..3ed2037 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java
@@ -3,12 +3,12 @@ package com.dayu.order.ui.fragment;
import android.content.res.AssetManager;
import android.graphics.Typeface;
import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+
import com.dayu.base.api.APIService;
import com.dayu.base.api.Api;
import com.dayu.base.ui.adapter.FragmentAdapter;
@@ -23,6 +23,7 @@ import com.dayu.order.presenter.homeorder.HomeOrderPresenter;
import com.dayu.provider.event.RefreshTab;
import com.dayu.provider.event.SwtichOrderFragment;
import com.dayu.utils.TabLayoutUtils;
+import com.google.android.material.tabs.TabLayout;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java b/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
index ce0d69f..67b17e4 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/fragment/MultiOrderDetailFragment.java
@@ -2,12 +2,13 @@ package com.dayu.order.ui.fragment;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/fragment/OperateDetailFragment.java b/orderCenter/src/main/java/com/dayu/order/ui/fragment/OperateDetailFragment.java
index 745ca05..2d31e5b 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/fragment/OperateDetailFragment.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/fragment/OperateDetailFragment.java
@@ -2,10 +2,11 @@ package com.dayu.order.ui.fragment;
import android.annotation.SuppressLint;
import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
import android.text.TextUtils;
import android.view.View;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.alibaba.android.arouter.launcher.ARouter;
import com.badoo.mobile.util.WeakHandler;
import com.dayu.base.api.protocol.CommentBean;
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java b/orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
index ea8e982..e00f24a 100755
--- a/orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderDetaillsFragment.java
@@ -2,12 +2,13 @@ package com.dayu.order.ui.fragment;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.LinearLayoutManager;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.ui.adapter.CoreAdapter;
import com.dayu.base.ui.fragment.DataBindingFragment;
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderOperateFragment.java b/orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderOperateFragment.java
index 6b824c4..f644ce3 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderOperateFragment.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderOperateFragment.java
@@ -1,11 +1,12 @@
package com.dayu.order.ui.fragment;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
import android.text.TextUtils;
import android.view.View;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
import com.dayu.base.ui.adapter.FragmentBaseAdapter;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.base.ui.fragment.DataBindingFragment;
diff --git a/orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderPartFragment.java b/orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderPartFragment.java
index 2e55b1e..2611c21 100644
--- a/orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderPartFragment.java
+++ b/orderCenter/src/main/java/com/dayu/order/ui/fragment/OrderPartFragment.java
@@ -1,7 +1,8 @@
package com.dayu.order.ui.fragment;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
+
+import androidx.fragment.app.Fragment;
import com.dayu.base.ui.adapter.FragmentBaseAdapter;
import com.dayu.base.ui.fragment.DataBindingFragment;
diff --git a/orderCenter/src/main/res/layout/activity_konwledge_center.xml b/orderCenter/src/main/res/layout/activity_konwledge_center.xml
index 33712b2..38b9031 100644
--- a/orderCenter/src/main/res/layout/activity_konwledge_center.xml
+++ b/orderCenter/src/main/res/layout/activity_konwledge_center.xml
@@ -46,7 +46,7 @@
android:layout_marginTop="2dp"
>
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_knowledge"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/orderCenter/src/main/res/layout/activity_konwledge_detail.xml b/orderCenter/src/main/res/layout/activity_konwledge_detail.xml
index 3cbeb48..bc3a92c 100644
--- a/orderCenter/src/main/res/layout/activity_konwledge_detail.xml
+++ b/orderCenter/src/main/res/layout/activity_konwledge_detail.xml
@@ -121,7 +121,7 @@
android:background="#f5f5f5"
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerview"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
diff --git a/orderCenter/src/main/res/layout/activity_multi_process_order.xml b/orderCenter/src/main/res/layout/activity_multi_process_order.xml
index 7e1ded8..66e05b7 100755
--- a/orderCenter/src/main/res/layout/activity_multi_process_order.xml
+++ b/orderCenter/src/main/res/layout/activity_multi_process_order.xml
@@ -206,7 +206,7 @@
style="@style/line"
android:layout_below="@id/rl_verion" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_sn"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -308,7 +308,7 @@
android:textSize="@dimen/sp_15"
android:visibility="gone" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/photo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -334,7 +334,7 @@
android:gravity="center"
android:onClick="@{()->presenter.commitPhoto()}"
android:text='@{presenter.mSpuState?"提交并处理下一个":"下一步"}'
- android:textColor="@color/white" />
+ android:textColor="@color/cl_white" />
</RelativeLayout>
</RelativeLayout>
</ScrollView>
@@ -364,7 +364,7 @@
android:layout_marginTop="4dp"
android:gravity="center"
android:text="@string/order_instruction"
- android:textColor="@color/white"
+ android:textColor="@color/cl_white"
android:textSize="12sp" />
</LinearLayout>
</RelativeLayout>
diff --git a/orderCenter/src/main/res/layout/activity_order_part_receive.xml b/orderCenter/src/main/res/layout/activity_order_part_receive.xml
index 690e2f1..259fd28 100644
--- a/orderCenter/src/main/res/layout/activity_order_part_receive.xml
+++ b/orderCenter/src/main/res/layout/activity_order_part_receive.xml
@@ -42,7 +42,7 @@
android:id="@+id/divider"
style="@style/card_line" />
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/tv_commit"
@@ -194,7 +194,7 @@
android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/photo"
android:layout_width="match_parent"
android:layout_height="80dp"
@@ -202,7 +202,7 @@
android:layout_marginRight="10dp"
android:layout_marginBottom="15dp" />
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
<TextView
android:id="@+id/tv_commit"
diff --git a/orderCenter/src/main/res/layout/activity_order_part_send.xml b/orderCenter/src/main/res/layout/activity_order_part_send.xml
index 49c4e27..f3fa9c7 100644
--- a/orderCenter/src/main/res/layout/activity_order_part_send.xml
+++ b/orderCenter/src/main/res/layout/activity_order_part_send.xml
@@ -43,7 +43,7 @@
android:id="@+id/divider"
style="@style/card_line" />
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/tv_confirm"
@@ -156,7 +156,7 @@
android:textColorHint="@color/cl_selector_hui"
android:textSize="@dimen/sp_13.3" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/photo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -231,7 +231,7 @@
</LinearLayout>
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
<TextView
android:id="@+id/tv_confirm"
diff --git a/orderCenter/src/main/res/layout/activity_process_order.xml b/orderCenter/src/main/res/layout/activity_process_order.xml
index 905dcba..33f0cce 100755
--- a/orderCenter/src/main/res/layout/activity_process_order.xml
+++ b/orderCenter/src/main/res/layout/activity_process_order.xml
@@ -402,7 +402,7 @@
android:textColor="@color/cl_home_title_text_color"
android:textSize="@dimen/sp_15" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/photo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/orderCenter/src/main/res/layout/activity_return_part_new.xml b/orderCenter/src/main/res/layout/activity_return_part_new.xml
index ea12907..9d157c0 100644
--- a/orderCenter/src/main/res/layout/activity_return_part_new.xml
+++ b/orderCenter/src/main/res/layout/activity_return_part_new.xml
@@ -44,7 +44,7 @@
<ImageView style="@style/card_line" />
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
@@ -211,7 +211,7 @@
</LinearLayout>
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
<TextView
android:id="@+id/tv_submit"
diff --git a/orderCenter/src/main/res/layout/activity_sop_local.xml b/orderCenter/src/main/res/layout/activity_sop_local.xml
index 544bc66..355ebc8 100644
--- a/orderCenter/src/main/res/layout/activity_sop_local.xml
+++ b/orderCenter/src/main/res/layout/activity_sop_local.xml
@@ -5,7 +5,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/white"
+ android:background="@color/cl_white"
android:orientation="vertical">
<RelativeLayout
@@ -170,7 +170,7 @@
android:textColor="@color/color_69" />
</LinearLayout>
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/photo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/orderCenter/src/main/res/layout/activty_preview.xml b/orderCenter/src/main/res/layout/activty_preview.xml
index 5a60afa..72e5a11 100755
--- a/orderCenter/src/main/res/layout/activty_preview.xml
+++ b/orderCenter/src/main/res/layout/activty_preview.xml
@@ -23,13 +23,13 @@
style="@style/title_image_back"/>
</RelativeLayout>
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/vp_preview"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/cl_order_text_one"
android:unselectedAlpha="1">
- </android.support.v4.view.ViewPager>
+ </androidx.viewpager.widget.ViewPager>
</LinearLayout>
</layout>
\ No newline at end of file
diff --git a/orderCenter/src/main/res/layout/fragment_multi_detail.xml b/orderCenter/src/main/res/layout/fragment_multi_detail.xml
index 77effe1..3ac7811 100644
--- a/orderCenter/src/main/res/layout/fragment_multi_detail.xml
+++ b/orderCenter/src/main/res/layout/fragment_multi_detail.xml
@@ -18,7 +18,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:id="@+id/nv_top"
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -127,7 +127,7 @@
android:layout_marginTop="15dp"
android:layout_toRightOf="@+id/tv_content">
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_server_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -182,7 +182,7 @@
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_device_count"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -215,7 +215,7 @@
android:drawableLeft="@drawable/ic_wrong_num"
android:textSize="14sp" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_wrong"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -252,7 +252,7 @@
android:textSize="14sp"
android:visibility="gone" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_wrong_info"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -419,7 +419,7 @@
android:layout_marginBottom="10dp"
android:layout_toRightOf="@+id/tv_remark">
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_fujian"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -817,7 +817,7 @@
android:textColor="@color/cl_home_title_text_color"
android:textSize="14sp" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -834,7 +834,7 @@
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
<TextView
android:id="@+id/customer_acceptance"
diff --git a/orderCenter/src/main/res/layout/fragment_operate_detail.xml b/orderCenter/src/main/res/layout/fragment_operate_detail.xml
index 3f7026d..a64f32c 100644
--- a/orderCenter/src/main/res/layout/fragment_operate_detail.xml
+++ b/orderCenter/src/main/res/layout/fragment_operate_detail.xml
@@ -14,7 +14,7 @@
android:layout_weight="1"
android:paddingBottom="3dp">
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:id="@+id/nsv_operate"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -53,7 +53,7 @@
</RelativeLayout>
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_sop"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -80,7 +80,7 @@
android:gravity="center"
android:paddingLeft="30dp"
android:text="@string/seller_support"
- android:textColor="@color/white"
+ android:textColor="@color/cl_white"
android:textSize="12sp" />
<ImageView
@@ -107,7 +107,7 @@
android:gravity="center"
android:paddingLeft="20dp"
android:text="@string/konwledge_querry"
- android:textColor="@color/white"
+ android:textColor="@color/cl_white"
android:textSize="12sp" />
<ImageView
android:layout_width="18dp"
@@ -135,7 +135,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_margin="10dp"
- android:background="@color/white"
+ android:background="@color/cl_white"
android:orientation="horizontal">
<ImageView
@@ -166,18 +166,18 @@
android:background="@color/cl_home_button"
android:gravity="center"
android:text="@string/send_str"
- android:textColor="@color/white"
+ android:textColor="@color/cl_white"
android:textSize="13sp" />
</LinearLayout>
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_component"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
<Button
@@ -191,7 +191,7 @@
android:background="@color/cl_home_button"
android:gravity="center"
android:text="@string/ask_detail"
- android:textColor="@color/white"
+ android:textColor="@color/cl_white"
android:textSize="13sp"
android:visibility="gone" />
</LinearLayout>
diff --git a/orderCenter/src/main/res/layout/fragment_order_datails.xml b/orderCenter/src/main/res/layout/fragment_order_datails.xml
index a32a0c0..94757da 100755
--- a/orderCenter/src/main/res/layout/fragment_order_datails.xml
+++ b/orderCenter/src/main/res/layout/fragment_order_datails.xml
@@ -21,7 +21,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
@@ -320,14 +320,14 @@
android:textSize="@dimen/sp_14" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_accessories"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_13"
android:layout_toRightOf="@id/tv_fujian">
- </android.support.v7.widget.RecyclerView>
+ </androidx.recyclerview.widget.RecyclerView>
</LinearLayout>
@@ -861,7 +861,7 @@
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
<TextView
android:id="@+id/customer_acceptance"
diff --git a/orderCenter/src/main/res/layout/fragment_order_home.xml b/orderCenter/src/main/res/layout/fragment_order_home.xml
index 8157575..2fedf6f 100755
--- a/orderCenter/src/main/res/layout/fragment_order_home.xml
+++ b/orderCenter/src/main/res/layout/fragment_order_home.xml
@@ -54,7 +54,7 @@
android:textSize="15dp"
tools:text="瑟吉欧房间爱佛家放假哦案件发哦附加按房间啊of瑟吉欧房间爱佛家放假哦案件发哦附加按房间啊of瑟吉欧房间爱佛家放假哦案件发哦附加按房间啊of瑟吉欧房间爱佛家放假哦案件发哦附加按房间啊of" />
- <android.support.design.widget.TabLayout
+ <com.google.android.material.tabs.TabLayout
android:id="@+id/tb_home"
android:layout_width="match_parent"
android:layout_height="78dp"
@@ -66,7 +66,7 @@
<ImageView style="@style/card_line" />
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/vp_home"
android:layout_width="match_parent"
android:layout_height="0dp"
diff --git a/orderCenter/src/main/res/layout/fragment_order_home1.xml b/orderCenter/src/main/res/layout/fragment_order_home1.xml
index d63c79d..b93757a 100755
--- a/orderCenter/src/main/res/layout/fragment_order_home1.xml
+++ b/orderCenter/src/main/res/layout/fragment_order_home1.xml
@@ -9,18 +9,18 @@
type="com.dayu.order.presenter.homeorder.HomeOrderPresenter" />
</data>
- <android.support.design.widget.CoordinatorLayout
+ <androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_white">
- <android.support.design.widget.AppBarLayout
+ <com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevation="0dp"
>
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_scrollFlags="scroll|enterAlways|snap">
@@ -40,9 +40,9 @@
android:text="@string/history_order"
android:textColor="#3faafc"
android:textSize="@dimen/dp_13.3" />
- </android.support.v7.widget.Toolbar>
+ </androidx.appcompat.widget.Toolbar>
- <android.support.design.widget.TabLayout
+ <com.google.android.material.tabs.TabLayout
android:id="@+id/tb_home"
android:layout_width="match_parent"
android:layout_height="78dp"
@@ -50,12 +50,12 @@
app:tabMaxWidth="0dp"
app:tabMode="fixed" />
- </android.support.design.widget.AppBarLayout>
+ </com.google.android.material.appbar.AppBarLayout>
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/vp_home"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
- </android.support.design.widget.CoordinatorLayout>
+ </androidx.coordinatorlayout.widget.CoordinatorLayout>
</layout>
\ No newline at end of file
diff --git a/orderCenter/src/main/res/layout/fragment_order_operate.xml b/orderCenter/src/main/res/layout/fragment_order_operate.xml
index 3e3e03e..1b81ab0 100644
--- a/orderCenter/src/main/res/layout/fragment_order_operate.xml
+++ b/orderCenter/src/main/res/layout/fragment_order_operate.xml
@@ -5,7 +5,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/vp_operate"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/orderCenter/src/main/res/layout/fragment_order_part.xml b/orderCenter/src/main/res/layout/fragment_order_part.xml
index 58c8b05..a9cefe3 100644
--- a/orderCenter/src/main/res/layout/fragment_order_part.xml
+++ b/orderCenter/src/main/res/layout/fragment_order_part.xml
@@ -7,7 +7,7 @@
android:background="@color/cl_white"
android:orientation="vertical">
- <android.support.design.widget.TabLayout
+ <com.google.android.material.tabs.TabLayout
android:id="@+id/tb_message"
android:layout_width="match_parent"
android:layout_height="46dp"
@@ -19,7 +19,7 @@
app:tabTextColor="@color/cl_tab_line" />
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/vp_message"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/orderCenter/src/main/res/layout/item_multi_process_foot.xml b/orderCenter/src/main/res/layout/item_multi_process_foot.xml
index 1af1050..f317c17 100644
--- a/orderCenter/src/main/res/layout/item_multi_process_foot.xml
+++ b/orderCenter/src/main/res/layout/item_multi_process_foot.xml
@@ -124,7 +124,7 @@
android:textColor="@color/default_text_color"
android:textSize="12sp" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/photo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/orderCenter/src/main/res/layout/item_sop_local.xml b/orderCenter/src/main/res/layout/item_sop_local.xml
index 3efc876..08d18a1 100644
--- a/orderCenter/src/main/res/layout/item_sop_local.xml
+++ b/orderCenter/src/main/res/layout/item_sop_local.xml
@@ -36,7 +36,7 @@
</LinearLayout>
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:visibility="gone"
android:id="@+id/rv_image"
android:layout_width="match_parent"
@@ -44,7 +44,7 @@
android:layout_marginBottom="15dp"
android:layout_marginTop="5dp"
/>
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:visibility="gone"
android:id="@+id/rv_video"
android:layout_width="match_parent"
diff --git a/saleCenter/src/main/java/com/bigfish/salecenter/adapter/TaskAdapter.java b/saleCenter/src/main/java/com/bigfish/salecenter/adapter/TaskAdapter.java
index 1f3e1a9..b1275e4 100644
--- a/saleCenter/src/main/java/com/bigfish/salecenter/adapter/TaskAdapter.java
+++ b/saleCenter/src/main/java/com/bigfish/salecenter/adapter/TaskAdapter.java
@@ -1,6 +1,7 @@
package com.bigfish.salecenter.adapter;
-import android.support.v7.widget.RecyclerView;
+
+import androidx.recyclerview.widget.RecyclerView;
import com.bigfish.salecenter.R;
import com.bigfish.salecenter.databinding.ItemTaskBinding;
diff --git a/saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/ProductDetailActivity.java b/saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/ProductDetailActivity.java
index 2ac58a7..a6e5bc0 100644
--- a/saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/ProductDetailActivity.java
+++ b/saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/ProductDetailActivity.java
@@ -1,9 +1,10 @@
package com.bigfish.salecenter.ui.activity;
import android.content.Intent;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
import com.bigfish.salecenter.R;
import com.bigfish.salecenter.api.SaleService;
diff --git a/saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/SaleOrderDetailActivity.java b/saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/SaleOrderDetailActivity.java
index b77741f..1e01e51 100644
--- a/saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/SaleOrderDetailActivity.java
+++ b/saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/SaleOrderDetailActivity.java
@@ -1,6 +1,7 @@
package com.bigfish.salecenter.ui.activity;
-import android.support.v7.widget.LinearLayoutManager;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
import com.bigfish.salecenter.R;
import com.bigfish.salecenter.api.SaleService;
diff --git a/saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/TestActivity.java b/saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/TestActivity.java
index e2389cc..f6f88cc 100644
--- a/saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/TestActivity.java
+++ b/saleCenter/src/main/java/com/bigfish/salecenter/ui/activity/TestActivity.java
@@ -1,10 +1,11 @@
package com.bigfish.salecenter.ui.activity;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
import android.view.Window;
import android.view.WindowManager;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.bigfish.salecenter.R;
import com.bigfish.salecenter.ui.fragment.HomeSaleFragment;
import com.dayu.utils.UserManager;
diff --git a/saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/HomeSaleFragment.java b/saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/HomeSaleFragment.java
index ed1aab9..5364ad1 100644
--- a/saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/HomeSaleFragment.java
+++ b/saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/HomeSaleFragment.java
@@ -3,12 +3,12 @@ package com.bigfish.salecenter.ui.fragment;
import android.content.res.AssetManager;
import android.graphics.Typeface;
import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+
import com.bigfish.salecenter.R;
import com.bigfish.salecenter.databinding.FragmentHomeSaleBinding;
import com.bigfish.salecenter.event.RefreshSaleTab;
@@ -22,6 +22,7 @@ import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.event.Notice;
import com.dayu.event.SaleTabNumEvent;
import com.dayu.utils.TabLayoutUtils;
+import com.google.android.material.tabs.TabLayout;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
diff --git a/saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/SaleInstructionFragment.java b/saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/SaleInstructionFragment.java
index f035b9c..9703e5d 100644
--- a/saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/SaleInstructionFragment.java
+++ b/saleCenter/src/main/java/com/bigfish/salecenter/ui/fragment/SaleInstructionFragment.java
@@ -4,13 +4,14 @@ import android.annotation.SuppressLint;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutManager;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CheckBox;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.alibaba.android.arouter.launcher.ARouter;
import com.badoo.mobile.util.WeakHandler;
import com.bigfish.salecenter.R;
diff --git a/saleCenter/src/main/res/layout/activity_order_detail.xml b/saleCenter/src/main/res/layout/activity_order_detail.xml
index 02a12f2..1a542f0 100644
--- a/saleCenter/src/main/res/layout/activity_order_detail.xml
+++ b/saleCenter/src/main/res/layout/activity_order_detail.xml
@@ -8,7 +8,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -20,14 +20,14 @@
android:id="@+id/tv_title"
style="@style/toolbar_title"
android:text="@string/sale_order_detail" />
- </android.support.v7.widget.Toolbar>
+ </androidx.appcompat.widget.Toolbar>
<com.scwang.smartrefresh.layout.SmartRefreshLayout
android:id="@+id/refresh_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="@dimen/dp_15"
@@ -252,14 +252,14 @@
android:text="@string/sale_record_str" />
</LinearLayout>
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_sell_step"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never" />
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>
diff --git a/saleCenter/src/main/res/layout/fragment_home_sale.xml b/saleCenter/src/main/res/layout/fragment_home_sale.xml
index c4c2793..bdf3d7c 100644
--- a/saleCenter/src/main/res/layout/fragment_home_sale.xml
+++ b/saleCenter/src/main/res/layout/fragment_home_sale.xml
@@ -36,7 +36,7 @@
android:textColor="@color/common_red"
android:textSize="15dp" />
- <android.support.design.widget.TabLayout
+ <com.google.android.material.tabs.TabLayout
android:id="@+id/tb_sale"
android:layout_width="match_parent"
android:layout_height="78dp"
@@ -48,7 +48,7 @@
<ImageView style="@style/card_line" />
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/vp_sale"
android:layout_width="match_parent"
android:layout_height="0dp"
diff --git a/saleCenter/src/main/res/layout/fragment_product_instruction.xml b/saleCenter/src/main/res/layout/fragment_product_instruction.xml
index bbfa97f..f8b8e55 100644
--- a/saleCenter/src/main/res/layout/fragment_product_instruction.xml
+++ b/saleCenter/src/main/res/layout/fragment_product_instruction.xml
@@ -8,7 +8,7 @@
android:paddingLeft="@dimen/dp_20"
android:paddingRight="@dimen/dp_20">
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:id="@+id/nsv_operate"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -105,7 +105,7 @@
</LinearLayout>
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
<LinearLayout
android:layout_width="match_parent"
diff --git a/saleCenter/src/main/res/layout/fragment_sale_instruction.xml b/saleCenter/src/main/res/layout/fragment_sale_instruction.xml
index 2358fd4..94d63c1 100644
--- a/saleCenter/src/main/res/layout/fragment_sale_instruction.xml
+++ b/saleCenter/src/main/res/layout/fragment_sale_instruction.xml
@@ -16,7 +16,7 @@
android:layout_marginBottom="60dp"
android:layout_above="@+id/btn_comment">
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:id="@+id/nsv_operate"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -58,7 +58,7 @@
style="@style/sale_detail_text"
android:text="@string/goods_apply_scene" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_scene"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -84,7 +84,7 @@
style="@style/sale_detail_text"
android:text="@string/sale_main_point" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_sell_point"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -129,7 +129,7 @@
android:visibility="gone"
android:text="地推具体任务：" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/tasks"
android:visibility="gone"
android:layout_width="match_parent"
@@ -165,7 +165,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
- android:background="@color/white"
+ android:background="@color/cl_white"
android:orientation="horizontal">
<ImageView
@@ -194,12 +194,12 @@
android:background="@color/cl_home_button"
android:gravity="center"
android:text="@string/send_str"
- android:textColor="@color/white"
+ android:textColor="@color/cl_white"
android:textSize="13sp" />
</LinearLayout>
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_component"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -208,7 +208,7 @@
</LinearLayout>
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
<Button
@@ -219,7 +219,7 @@
android:layout_marginBottom="5dp"
android:background="@color/cl_home_button"
android:text="@string/ask_detail"
- android:textColor="@color/white"
+ android:textColor="@color/cl_white"
android:textSize="13sp"
android:visibility="gone" />
@@ -238,7 +238,7 @@
android:background="@drawable/btn_blue_commom"
android:gravity="center"
android:text="转发推荐"
- android:textColor="@color/white" />
+ android:textColor="@color/cl_white" />
<Button
android:id="@+id/getAward"
@@ -249,7 +249,7 @@
android:background="@drawable/btn_green_commom"
android:gravity="center"
android:text="申请奖励"
- android:textColor="@color/white" />
+ android:textColor="@color/cl_white" />
</LinearLayout>
</RelativeLayout>
diff --git a/userCenter/src/main/java/com/dayu/usercenter/adapter/ServiceWechatAdapter.java b/userCenter/src/main/java/com/dayu/usercenter/adapter/ServiceWechatAdapter.java
index 803b2f8..4c30911 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/adapter/ServiceWechatAdapter.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/adapter/ServiceWechatAdapter.java
@@ -1,8 +1,9 @@
package com.dayu.usercenter.adapter;
-import android.support.annotation.Nullable;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.dayu.usercenter.R;
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/activity/ModifyPersonInfoActivity.java b/userCenter/src/main/java/com/dayu/usercenter/ui/activity/ModifyPersonInfoActivity.java
index 32c68e6..27c586f 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity/ModifyPersonInfoActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity/ModifyPersonInfoActivity.java
@@ -10,13 +10,16 @@ import com.dayu.usercenter.R;
import com.dayu.usercenter.databinding.ActivityModifyPersonActivityBinding;
import com.dayu.usercenter.presenter.modifyperson.ModifyPersonContract;
import com.dayu.usercenter.presenter.modifyperson.ModifyPersonPresenter;
+import com.dayu.utils.GlideEngine;
+import com.dayu.utils.ImageFileCropEngine;
import com.dayu.utils.MPermissionUtils;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.listener.OnCloseListener;
-import com.luck.picture.lib.PictureSelectionModel;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelectionModel;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
-import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.config.SelectMimeType;
+import com.luck.picture.lib.config.SelectModeConfig;
import com.luck.picture.lib.entity.LocalMedia;
import java.io.File;
@@ -62,25 +65,36 @@ public class ModifyPersonInfoActivity extends BaseActivity<ModifyPersonPresenter
public void showPicture() {
PictureSelectionModel selector = PictureSelector.create(mActivity)
- .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
- .maxSelectNum(1)// 最大图片选择数量 int
- .imageSpanCount(4)// 每行显示个数 int
- .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
- .previewImage(true)// 是否可预览图片 true or false
- .isCamera(true)// 是否显示拍照按钮 true or false
- .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
- .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
- .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
- .compress(true)// 是否压缩 true or false
- .glideOverride(300, 300)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
- .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
- .compressSavePath(getPath())//压缩图片保存地址
- .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
-// .minimumCompressSize(100)// 小于100kb的图片不压缩
- .synOrAsy(true)//同步true或异步false 压缩 默认同步、
- .enableCrop(true)//是否裁剪
- .withAspectRatio(1, 1)
- .freeStyleCropEnabled(false);
+ .openGallery(SelectMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+// .setFilterMaxFileSize(1)
+ .setImageEngine(GlideEngine.createGlideEngine())
+ .setCropEngine(new ImageFileCropEngine())
+ .setImageSpanCount(4)
+ .setSelectionMode(SelectModeConfig.MULTIPLE)
+ .isPreviewImage(true)
+ .isDisplayCamera(true)
+ .isSelectZoomAnim(true)
+ .setOutputCameraDir("/CustomPath");
+// PictureSelectionModel selector = PictureSelector.create(mActivity)
+// .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+// .maxSelectNum(1)// 最大图片选择数量 int
+// .imageSpanCount(4)// 每行显示个数 int
+// .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
+// .previewImage(true)// 是否可预览图片 true or false
+// .isCamera(true)// 是否显示拍照按钮 true or false
+// .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
+// .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
+// .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
+// .compress(true)// 是否压缩 true or false
+// .glideOverride(300, 300)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
+// .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
+// .compressSavePath(getPath())//压缩图片保存地址
+// .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
+//// .minimumCompressSize(100)// 小于100kb的图片不压缩
+// .synOrAsy(true)//同步true或异步false 压缩 默认同步、
+// .enableCrop(true)//是否裁剪
+// .withAspectRatio(1, 1)
+// .freeStyleCropEnabled(false);
selector.forResult(PictureConfig.CHOOSE_REQUEST);
}
@@ -127,7 +141,7 @@ public class ModifyPersonInfoActivity extends BaseActivity<ModifyPersonPresenter
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
- List<LocalMedia> list = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> list = PictureSelector.obtainSelectorList(data);
if (list != null) {
for (int a = 0; a < list.size(); a++) {
mPresenter.mIdentityUrl.set(list.get(a).getCutPath());
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/activity/MyHeaderIvActivity.java b/userCenter/src/main/java/com/dayu/usercenter/ui/activity/MyHeaderIvActivity.java
index b3b2492..3d25aea 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity/MyHeaderIvActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity/MyHeaderIvActivity.java
@@ -11,13 +11,16 @@ import com.dayu.usercenter.R;
import com.dayu.usercenter.databinding.MyHeaderActivityBinding;
import com.dayu.usercenter.presenter.myhead.MyHeadContract;
import com.dayu.usercenter.presenter.myhead.MyHeadPresenter;
+import com.dayu.utils.GlideEngine;
+import com.dayu.utils.ImageFileCropEngine;
import com.dayu.utils.MPermissionUtils;
-import com.luck.picture.lib.PictureSelectionModel;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelectionModel;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
-import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.config.SelectMimeType;
+import com.luck.picture.lib.config.SelectModeConfig;
import com.luck.picture.lib.entity.LocalMedia;
-import com.luck.picture.lib.tools.PictureFileUtils;
+import com.luck.picture.lib.utils.PictureFileUtils;
import java.io.File;
import java.util.List;
@@ -57,25 +60,36 @@ public class MyHeaderIvActivity extends BaseActivity<MyHeadPresenter, MyHeaderAc
@Override
public void onPermissionGranted() {
PictureSelectionModel selector = PictureSelector.create(mActivity)
- .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
- .maxSelectNum(1)// 最大图片选择数量 int
- .imageSpanCount(4)// 每行显示个数 int
- .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
- .previewImage(true)// 是否可预览图片 true or false
- .isCamera(true)// 是否显示拍照按钮 true or false
- .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
- .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
- .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
- .compress(true)// 是否压缩 true or false
- .glideOverride(300, 300)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
- .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
- .compressSavePath(getPath())//压缩图片保存地址
- .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
- .minimumCompressSize(100)// 小于100kb的图片不压缩
- .synOrAsy(true)//同步true或异步false 压缩 默认同步、
- .enableCrop(true)//是否裁剪
- .withAspectRatio(1, 1)
- .freeStyleCropEnabled(false);
+ .openGallery(SelectMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+// .setFilterMaxFileSize(1)
+ .setImageEngine(GlideEngine.createGlideEngine())
+ .setCropEngine(new ImageFileCropEngine())
+ .setImageSpanCount(4)
+ .setSelectionMode(SelectModeConfig.MULTIPLE)
+ .isPreviewImage(true)
+ .isDisplayCamera(true)
+ .isSelectZoomAnim(true)
+ .setOutputCameraDir("/CustomPath");
+// PictureSelectionModel selector = PictureSelector.create(mActivity)
+// .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+// .maxSelectNum(1)// 最大图片选择数量 int
+// .imageSpanCount(4)// 每行显示个数 int
+// .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
+// .previewImage(true)// 是否可预览图片 true or false
+// .isCamera(true)// 是否显示拍照按钮 true or false
+// .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
+// .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
+// .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
+// .compress(true)// 是否压缩 true or false
+// .glideOverride(300, 300)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
+// .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
+// .compressSavePath(getPath())//压缩图片保存地址
+// .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
+// .minimumCompressSize(100)// 小于100kb的图片不压缩
+// .synOrAsy(true)//同步true或异步false 压缩 默认同步、
+// .enableCrop(true)//是否裁剪
+// .withAspectRatio(1, 1)
+// .freeStyleCropEnabled(false);
selector.forResult(PictureConfig.CHOOSE_REQUEST);
// MobclickAgent.onEvent(mActivity, "modify_header_pic");
}
@@ -88,7 +102,7 @@ public class MyHeaderIvActivity extends BaseActivity<MyHeadPresenter, MyHeaderAc
@Override
public void deleteCacheDirFile() {
- PictureFileUtils.deleteCacheDirFile(mActivity);
+ PictureFileUtils.deleteAllCacheDirFile(mActivity);
}
private String getPath() {
@@ -118,7 +132,7 @@ public class MyHeaderIvActivity extends BaseActivity<MyHeadPresenter, MyHeaderAc
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
- List<LocalMedia> mSelectList = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> mSelectList = PictureSelector.obtainSelectorList(data);
if (mSelectList != null) {
for (int a = 0; a < mSelectList.size(); a++) {
mPresenter.uploadPic(mSelectList.get(a).getCutPath());
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/activity/PersonInfoActivity.java b/userCenter/src/main/java/com/dayu/usercenter/ui/activity/PersonInfoActivity.java
index 8deab91..2fddbf8 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity/PersonInfoActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity/PersonInfoActivity.java
@@ -14,16 +14,19 @@ import com.dayu.usercenter.R;
import com.dayu.usercenter.databinding.ActivityPersonInfoBinding;
import com.dayu.usercenter.presenter.personinfo.PersonInfoContract;
import com.dayu.usercenter.presenter.personinfo.PersonInfoPresenter;
+import com.dayu.utils.GlideEngine;
+import com.dayu.utils.ImageFileCropEngine;
import com.dayu.utils.MPermissionUtils;
import com.dayu.utils.UserManager;
import com.dayu.widgets.CustomDialog;
import com.dayu.widgets.RegisterDialog;
-import com.luck.picture.lib.PictureSelectionModel;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelectionModel;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
-import com.luck.picture.lib.config.PictureMimeType;
+import com.luck.picture.lib.config.SelectMimeType;
+import com.luck.picture.lib.config.SelectModeConfig;
import com.luck.picture.lib.entity.LocalMedia;
-import com.luck.picture.lib.tools.PictureFileUtils;
+import com.luck.picture.lib.utils.PictureFileUtils;
import java.io.File;
import java.util.List;
@@ -79,25 +82,37 @@ public class PersonInfoActivity extends BaseActivity<PersonInfoPresenter, Activi
private void showPicture(){
PictureSelectionModel selector = PictureSelector.create(mActivity)
- .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
- .maxSelectNum(1)// 最大图片选择数量 int
- .imageSpanCount(4)// 每行显示个数 int
- .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
- .previewImage(true)// 是否可预览图片 true or false
- .isCamera(true)// 是否显示拍照按钮 true or false
- .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
- .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
- .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
- .compress(true)// 是否压缩 true or false
- .glideOverride(300, 300)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
- .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
- .compressSavePath(getPath())//压缩图片保存地址
- .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
- .minimumCompressSize(100)// 小于100kb的图片不压缩
- .synOrAsy(true)//同步true或异步false 压缩 默认同步、
- .enableCrop(true)//是否裁剪
- .withAspectRatio(1, 1)
- .freeStyleCropEnabled(false);
+ .openGallery(SelectMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+ .setImageEngine(GlideEngine.createGlideEngine())
+ .setCropEngine(new ImageFileCropEngine())
+// .setFilterMaxFileSize(1)
+ .setSelectionMode(SelectModeConfig.SINGLE)
+ .setImageSpanCount(4)
+ .setSelectionMode(SelectModeConfig.MULTIPLE);
+// .isPreviewImage(true)
+// .isDisplayCamera(true)
+// .isSelectZoomAnim(true)
+// .setOutputCameraDir("/CustomPath");
+// PictureSelectionModel selector = PictureSelector.create(mActivity)
+// .openGallery(PictureMimeType.ofImage())//全部.PictureMimeType.ofAll()、图片.ofImage()、视频.ofVideo()
+// .maxSelectNum(1)// 最大图片选择数量 int
+// .imageSpanCount(4)// 每行显示个数 int
+// .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选 PictureConfig.MULTIPLE or PictureConfig.SINGLE
+// .previewImage(true)// 是否可预览图片 true or false
+// .isCamera(true)// 是否显示拍照按钮 true or false
+// .isZoomAnim(true)// 图片列表点击 缩放效果 默认true
+// .sizeMultiplier(0.1f)// glide 加载图片大小 0~1之间 如设置 .glideOverride()无效
+// .setOutputCameraPath("/CustomPath")// 自定义拍、照保存路径,可不填
+// .compress(true)// 是否压缩 true or false
+// .glideOverride(300, 300)// int glide 加载宽高，越小图片列表越流畅，但会影响列表图片浏览的清晰度
+// .hideBottomControls(true)// 是否显示uCrop工具栏，默认不显示 true or false
+// .compressSavePath(getPath())//压缩图片保存地址
+// .previewEggs(true)// 预览图片时 是否增强左右滑动图片体验(图片滑动一半即可看到上一张是否选中) true or false
+// .minimumCompressSize(100)// 小于100kb的图片不压缩
+// .synOrAsy(true)//同步true或异步false 压缩 默认同步、
+// .enableCrop(true)//是否裁剪
+// .withAspectRatio(1, 1)
+// .freeStyleCropEnabled(false);
selector.forResult(PictureConfig.CHOOSE_REQUEST);
// MobclickAgent.onEvent(mActivity, "modify_header_pic");
}
@@ -113,7 +128,7 @@ public class PersonInfoActivity extends BaseActivity<PersonInfoPresenter, Activi
@Override
public void deleteCacheDirFile() {
- PictureFileUtils.deleteCacheDirFile(mActivity);
+ PictureFileUtils.deleteAllCacheDirFile(mActivity);
}
@Override
@@ -122,7 +137,7 @@ public class PersonInfoActivity extends BaseActivity<PersonInfoPresenter, Activi
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
- List<LocalMedia> mSelectList = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> mSelectList = PictureSelector.obtainSelectorList(data);
if (mSelectList != null) {
for (int a = 0; a < mSelectList.size(); a++) {
mPresenter.uploadPic(mSelectList.get(a).getCutPath());
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/activity/RegisterActivity.java b/userCenter/src/main/java/com/dayu/usercenter/ui/activity/RegisterActivity.java
index 381b8bb..8a4533e 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity/RegisterActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity/RegisterActivity.java
@@ -22,7 +22,7 @@ import com.dayu.utils.PictrueUtils;
import com.dayu.utils.ProgressUtil;
import com.dayu.utils.ToastUtils;
import com.dayu.utils.UtilsUserAccountMatcher;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia;
@@ -163,7 +163,7 @@ public class RegisterActivity extends BaseActivity<SImplePresenter, ActivityRegi
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
- List<LocalMedia> mSelectList = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> mSelectList = PictureSelector.obtainSelectorList(data);
if (mSelectList != null) {
avatarPath = mSelectList.get(0).getCutPath();
GlideImageLoader.loadDrawable(this, avatarPath, mBind.civAvatar);
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/activity/SmsLoginActivity.java b/userCenter/src/main/java/com/dayu/usercenter/ui/activity/SmsLoginActivity.java
index f2b5ae5..4450630 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity/SmsLoginActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity/SmsLoginActivity.java
@@ -5,7 +5,6 @@ import android.app.Dialog;
import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
-import android.support.annotation.NonNull;
import android.text.Editable;
import android.text.Spannable;
import android.text.SpannableString;
@@ -14,6 +13,8 @@ import android.text.style.ClickableSpan;
import android.text.style.ForegroundColorSpan;
import android.view.View;
+import androidx.annotation.NonNull;
+
import com.alibaba.android.arouter.facade.annotation.Route;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.common.BaseConstant;
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/activity/TestActivity.java b/userCenter/src/main/java/com/dayu/usercenter/ui/activity/TestActivity.java
index 0d64ae7..1e89dc8 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity/TestActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity/TestActivity.java
@@ -1,10 +1,11 @@
package com.dayu.usercenter.ui.activity;
import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
import android.view.Window;
import android.view.WindowManager;
+import androidx.appcompat.app.AppCompatActivity;
+
import com.dayu.usercenter.R;
import com.dayu.usercenter.ui.fragment.HomePersonFragment;
import com.dayu.usercenter.ui.fragment.HomeUserFragment;
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/BusinessTypeActivity.java b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/BusinessTypeActivity.java
index 49dcaa2..a3df0d0 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/BusinessTypeActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/BusinessTypeActivity.java
@@ -1,6 +1,5 @@
package com.dayu.usercenter.ui.activity2;
-import android.support.v7.widget.GridLayoutManager;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.view.View;
@@ -8,6 +7,8 @@ import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
+import androidx.recyclerview.widget.GridLayoutManager;
+
import com.alibaba.android.arouter.facade.annotation.Route;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CashRecordActivity.java b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CashRecordActivity.java
index 38e6d50..08e722a 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CashRecordActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CashRecordActivity.java
@@ -1,6 +1,7 @@
package com.dayu.usercenter.ui.activity2;
-import android.support.v7.widget.LinearLayoutManager;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CommonRecordActivity.java b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CommonRecordActivity.java
index fa6ded3..19007f0 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CommonRecordActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/CommonRecordActivity.java
@@ -2,7 +2,8 @@ package com.dayu.usercenter.ui.activity2;
import android.content.Context;
import android.content.Intent;
-import android.support.v7.widget.LinearLayoutManager;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.facade.annotation.Route;
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/InviteRecordActivity.java b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/InviteRecordActivity.java
index e501647..84c7d38 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/InviteRecordActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/InviteRecordActivity.java
@@ -1,6 +1,7 @@
package com.dayu.usercenter.ui.activity2;
-import android.support.v7.widget.LinearLayoutManager;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/RegisterActivity.java b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/RegisterActivity.java
index 8cbb3df..9b3f260 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/RegisterActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/RegisterActivity.java
@@ -17,14 +17,13 @@ import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserService2;
import com.dayu.usercenter.databinding.ActivityRegisterVerifyBinding;
import com.dayu.usercenter.model.bean.ServiceBean;
-import com.dayu.usercenter.model.bean.ServiceSaveBean;
import com.dayu.usercenter.model.bean.ServiceSaveBean1;
import com.dayu.usercenter.model.bean.ServiceTypeBean;
import com.dayu.utils.CommonUtils;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.SelectPicUtils;
import com.dayu.utils.ToastUtils;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.entity.LocalMedia;
import org.greenrobot.eventbus.EventBus;
@@ -197,7 +196,7 @@ public class RegisterActivity extends BaseActivity<SImplePresenter, ActivityRegi
if (resultCode == RESULT_OK) {
mBind.rootView.requestFocus();
CommonUtils.hideSoftInput(mActivity);
- List<LocalMedia> mSelectList = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> mSelectList = PictureSelector.obtainSelectorList(data);
if (mSelectList != null && mSelectList.size() > 0) {
if (requestCode == headerRequest) {
accountUrl = "";
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/SelfLicenceActivity.java b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/SelfLicenceActivity.java
index 13e5d0d..feaf00a 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/SelfLicenceActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/SelfLicenceActivity.java
@@ -2,7 +2,6 @@ package com.dayu.usercenter.ui.activity2;
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.Nullable;
import com.dayu.base.ui.activity.BaseActivity;
import com.dayu.base.ui.fragment.BaseFragment;
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/ServerRegisterActivity.java b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/ServerRegisterActivity.java
index 10bd461..f768311 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/ServerRegisterActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/ServerRegisterActivity.java
@@ -1,7 +1,6 @@
package com.dayu.usercenter.ui.activity2;
import android.Manifest;
-import android.support.v7.widget.GridLayoutManager;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.view.View;
@@ -9,6 +8,8 @@ import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
+import androidx.recyclerview.widget.GridLayoutManager;
+
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter;
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UploadSelfLicenceActivity.java b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UploadSelfLicenceActivity.java
index 62c0cfc..7c31843 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UploadSelfLicenceActivity.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/activity2/UploadSelfLicenceActivity.java
@@ -15,7 +15,7 @@ import com.dayu.usercenter.event.UploadSelfLicenceEvent;
import com.dayu.usercenter.model.UploadSelfLicenceData;
import com.dayu.utils.GlideImageLoader;
import com.dayu.utils.MediaChooseUtils;
-import com.luck.picture.lib.PictureSelector;
+import com.luck.picture.lib.basic.PictureSelector;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.entity.LocalMedia;
@@ -137,7 +137,7 @@ public class UploadSelfLicenceActivity extends BaseActivity<SImplePresenter, Act
if (resultCode == RESULT_OK) {
switch (requestCode) {
case PictureConfig.CHOOSE_REQUEST:
- List<LocalMedia> mSelectList = PictureSelector.obtainMultipleResult(data);
+ List<LocalMedia> mSelectList = PictureSelector.obtainSelectorList(data);
if (mSelectList != null) {
imgEditUrl = "";
for (int a = 0; a < mSelectList.size(); a++) {
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/BusinessFragment.java b/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/BusinessFragment.java
index a4743af..30c8c41 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/BusinessFragment.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/BusinessFragment.java
@@ -1,11 +1,12 @@
package com.dayu.usercenter.ui.fragment;
import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
import android.view.View;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
import com.dayu.base.api.APIService;
import com.dayu.base.api.Api;
import com.dayu.base.ui.fragment.BaseFragment;
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java b/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
index e1994b5..a10ded5 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/HomeUserFragment.java
@@ -2,11 +2,12 @@ package com.dayu.usercenter.ui.fragment;
import android.content.Intent;
import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
import android.text.TextUtils;
import android.view.View;
import android.widget.Toast;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.alibaba.android.arouter.launcher.ARouter;
import com.dayu.base.api.APIService;
import com.dayu.base.api.Api;
diff --git a/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/SelfLicenceFragment.java b/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/SelfLicenceFragment.java
index 303695c..56a2ed9 100644
--- a/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/SelfLicenceFragment.java
+++ b/userCenter/src/main/java/com/dayu/usercenter/ui/fragment/SelfLicenceFragment.java
@@ -2,7 +2,8 @@ package com.dayu.usercenter.ui.fragment;
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.Nullable;
import com.dayu.base.ui.fragment.BaseFragment;
import com.dayu.common.Constants;
diff --git a/userCenter/src/main/res/layout/activity_agreement.xml b/userCenter/src/main/res/layout/activity_agreement.xml
index 3b1463d..7864a19 100644
--- a/userCenter/src/main/res/layout/activity_agreement.xml
+++ b/userCenter/src/main/res/layout/activity_agreement.xml
@@ -7,7 +7,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -17,7 +17,7 @@
<TextView
android:id="@+id/tv_title"
style="@style/toolbar_title" />
- </android.support.v7.widget.Toolbar>
+ </androidx.appcompat.widget.Toolbar>
<WebView
android:id="@+id/webView"
diff --git a/userCenter/src/main/res/layout/activity_business_type.xml b/userCenter/src/main/res/layout/activity_business_type.xml
index fb86142..e9bfd60 100644
--- a/userCenter/src/main/res/layout/activity_business_type.xml
+++ b/userCenter/src/main/res/layout/activity_business_type.xml
@@ -38,7 +38,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp">
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -173,7 +173,7 @@
android:text="@string/business_choose_scene"
android:visibility="gone" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_scene"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -190,7 +190,7 @@
android:textSize="@dimen/size_login_hint_text"
android:textStyle="bold" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -198,7 +198,7 @@
android:layout_marginTop="15dp"
android:overScrollMode="never" />
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>
diff --git a/userCenter/src/main/res/layout/activity_cash_record.xml b/userCenter/src/main/res/layout/activity_cash_record.xml
index 05b6cf4..9ca3560 100644
--- a/userCenter/src/main/res/layout/activity_cash_record.xml
+++ b/userCenter/src/main/res/layout/activity_cash_record.xml
@@ -60,7 +60,7 @@
android:layout_height="match_parent"
android:layout_marginBottom="65dp">
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:layout_marginLeft="1dp"
android:layout_marginRight="1dp"
android:id="@+id/rv_cache"
diff --git a/userCenter/src/main/res/layout/activity_common_record.xml b/userCenter/src/main/res/layout/activity_common_record.xml
index 8d7803d..d24d287 100644
--- a/userCenter/src/main/res/layout/activity_common_record.xml
+++ b/userCenter/src/main/res/layout/activity_common_record.xml
@@ -115,7 +115,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_record"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/userCenter/src/main/res/layout/activity_invate_new.xml b/userCenter/src/main/res/layout/activity_invate_new.xml
index 46ad0c4..13f60aa 100644
--- a/userCenter/src/main/res/layout/activity_invate_new.xml
+++ b/userCenter/src/main/res/layout/activity_invate_new.xml
@@ -24,7 +24,7 @@
<ImageView style="@style/card_line" />
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
@@ -51,7 +51,7 @@
android:textSize="50sp" />
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
<TextView
android:id="@+id/tv_forward"
diff --git a/userCenter/src/main/res/layout/activity_invite_record.xml b/userCenter/src/main/res/layout/activity_invite_record.xml
index 5abce71..7b5eb89 100644
--- a/userCenter/src/main/res/layout/activity_invite_record.xml
+++ b/userCenter/src/main/res/layout/activity_invite_record.xml
@@ -68,7 +68,7 @@
android:layout_height="match_parent"
android:layout_marginBottom="65dp">
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:layout_marginLeft="1dp"
android:layout_marginRight="1dp"
android:id="@+id/rv_cache"
diff --git a/userCenter/src/main/res/layout/activity_modify_pwd_layout.xml b/userCenter/src/main/res/layout/activity_modify_pwd_layout.xml
index 78829c1..20158c6 100644
--- a/userCenter/src/main/res/layout/activity_modify_pwd_layout.xml
+++ b/userCenter/src/main/res/layout/activity_modify_pwd_layout.xml
@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -23,7 +23,7 @@
<TextView
android:id="@+id/tv_title"
style="@style/toolbar_title" />
- </android.support.v7.widget.Toolbar>
+ </androidx.appcompat.widget.Toolbar>
<LinearLayout
android:layout_width="match_parent"
diff --git a/userCenter/src/main/res/layout/activity_new_pwd_layout.xml b/userCenter/src/main/res/layout/activity_new_pwd_layout.xml
index a5bcf19..9af7671 100644
--- a/userCenter/src/main/res/layout/activity_new_pwd_layout.xml
+++ b/userCenter/src/main/res/layout/activity_new_pwd_layout.xml
@@ -15,7 +15,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -25,7 +25,7 @@
<TextView
android:id="@+id/tv_title"
style="@style/toolbar_title" />
- </android.support.v7.widget.Toolbar>
+ </androidx.appcompat.widget.Toolbar>
<LinearLayout
android:layout_width="match_parent"
diff --git a/userCenter/src/main/res/layout/activity_pwlogin_layout.xml b/userCenter/src/main/res/layout/activity_pwlogin_layout.xml
index 9c7496a..bf19812 100644
--- a/userCenter/src/main/res/layout/activity_pwlogin_layout.xml
+++ b/userCenter/src/main/res/layout/activity_pwlogin_layout.xml
@@ -13,13 +13,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:navigationIcon="@drawable/back_btn_normal">
- </android.support.v7.widget.Toolbar>
+ </androidx.appcompat.widget.Toolbar>
<RelativeLayout
android:layout_width="match_parent"
diff --git a/userCenter/src/main/res/layout/activity_register_verify.xml b/userCenter/src/main/res/layout/activity_register_verify.xml
index 0e0cd08..6758eea 100644
--- a/userCenter/src/main/res/layout/activity_register_verify.xml
+++ b/userCenter/src/main/res/layout/activity_register_verify.xml
@@ -37,7 +37,7 @@
android:layout_height="match_parent"
android:layout_marginBottom="65dp">
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -52,7 +52,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_weight="1"
android:orientation="vertical"
android:paddingStart="10dp"
android:paddingTop="10dp"
@@ -222,7 +221,7 @@
</LinearLayout>
</LinearLayout>
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>
diff --git a/userCenter/src/main/res/layout/activity_server_register_verify.xml b/userCenter/src/main/res/layout/activity_server_register_verify.xml
index 96f3321..b683a3b 100644
--- a/userCenter/src/main/res/layout/activity_server_register_verify.xml
+++ b/userCenter/src/main/res/layout/activity_server_register_verify.xml
@@ -36,7 +36,7 @@
android:layout_height="match_parent"
android:layout_marginBottom="65dp">
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -191,7 +191,7 @@
android:layout_marginEnd="5dp"
android:background="@color/default_text_color" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -280,7 +280,7 @@
</LinearLayout>
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>
diff --git a/userCenter/src/main/res/layout/activity_test_record.xml b/userCenter/src/main/res/layout/activity_test_record.xml
index c96abc5..d944620 100644
--- a/userCenter/src/main/res/layout/activity_test_record.xml
+++ b/userCenter/src/main/res/layout/activity_test_record.xml
@@ -23,7 +23,7 @@
<ImageView style="@style/card_line" />
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -224,7 +224,7 @@
</LinearLayout>
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
</LinearLayout>
</layout>
\ No newline at end of file
diff --git a/userCenter/src/main/res/layout/activity_user_info.xml b/userCenter/src/main/res/layout/activity_user_info.xml
index a1c4218..02cf012 100644
--- a/userCenter/src/main/res/layout/activity_user_info.xml
+++ b/userCenter/src/main/res/layout/activity_user_info.xml
@@ -44,7 +44,7 @@
</RelativeLayout>
</RelativeLayout>
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -334,6 +334,6 @@
</LinearLayout>
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
</LinearLayout>
</layout>
\ No newline at end of file
diff --git a/userCenter/src/main/res/layout/activity_user_licence_list.xml b/userCenter/src/main/res/layout/activity_user_licence_list.xml
index 62b4aa1..ca3b5e5 100644
--- a/userCenter/src/main/res/layout/activity_user_licence_list.xml
+++ b/userCenter/src/main/res/layout/activity_user_licence_list.xml
@@ -55,7 +55,7 @@
</LinearLayout>
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_licence"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/userCenter/src/main/res/layout/forget_pwd_layout.xml b/userCenter/src/main/res/layout/forget_pwd_layout.xml
index 055d716..a742bca 100644
--- a/userCenter/src/main/res/layout/forget_pwd_layout.xml
+++ b/userCenter/src/main/res/layout/forget_pwd_layout.xml
@@ -14,7 +14,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <android.support.v7.widget.Toolbar
+ <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -24,7 +24,7 @@
<TextView
android:id="@+id/tv_title"
style="@style/toolbar_title" />
- </android.support.v7.widget.Toolbar>
+ </androidx.appcompat.widget.Toolbar>
<LinearLayout
android:layout_width="match_parent"
diff --git a/userCenter/src/main/res/layout/fragment_home_user.xml b/userCenter/src/main/res/layout/fragment_home_user.xml
index d9dacb0..e9da18c 100644
--- a/userCenter/src/main/res/layout/fragment_home_user.xml
+++ b/userCenter/src/main/res/layout/fragment_home_user.xml
@@ -64,7 +64,7 @@
android:layout_weight="1"
android:paddingBottom="2dp">
- <android.support.v4.widget.NestedScrollView
+ <androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/cl_white">
@@ -622,7 +622,7 @@
android:textSize="15sp"
android:visibility="gone" />
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_wechat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -664,7 +664,7 @@
android:textSize="18dp"
android:visibility="gone" />
</LinearLayout>
- </android.support.v4.widget.NestedScrollView>
+ </androidx.core.widget.NestedScrollView>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
</LinearLayout>
diff --git a/userCenter/src/main/res/layout/fragment_user_licence.xml b/userCenter/src/main/res/layout/fragment_user_licence.xml
index da45e48..14a97a9 100644
--- a/userCenter/src/main/res/layout/fragment_user_licence.xml
+++ b/userCenter/src/main/res/layout/fragment_user_licence.xml
@@ -13,7 +13,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <android.support.v7.widget.RecyclerView
+ <androidx.recyclerview.widget.RecyclerView
android:visibility="gone"
android:id="@+id/rv_licence"
android:layout_marginTop="15dp"