Merge pull request #50 from funson86/master

支持Android Studio 3.4.1 默认androidx gradle:3.4.1
TommyLemon · Aug 2, 2022 · 4eac93e · 4eac93e
2 parents 19f3429 + 5208405
commit 4eac93e
Show file tree

Hide file tree

Showing 37 changed files with 121 additions and 97 deletions.
diff --git a/QRCodeLibrary/build.gradle b/QRCodeLibrary/build.gradle
@@ -1,28 +1,38 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 22
+        minSdkVersion 19
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
     }
+
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    productFlavors {
-    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 dependencies {
-    api fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/QRCodeLibrary/src/main/java/com/zxing/encoding/EncodingHandler.java b/QRCodeLibrary/src/main/java/com/zxing/encoding/EncodingHandler.java
@@ -16,7 +16,7 @@
 public final class EncodingHandler {
 	private static final int BLACK = 0xff000000;
 
-	public static Bitmap createQRCode(String str,int widthAndHeight) throws WriterException {
+	public static Bitmap createQRCode(String str,int widthAndHeight) throws Exception {
 		Hashtable<EncodeHintType, String> hints = new Hashtable<EncodeHintType, String>();  
         hints.put(EncodeHintType.CHARACTER_SET, "utf-8"); 
 		BitMatrix matrix = new MultiFormatWriter().encode(str,

diff --git a/ZBLibrary/build.gradle b/ZBLibrary/build.gradle
@@ -1,37 +1,46 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 27
+        minSdkVersion 19
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
     }
+
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    useLibrary 'org.apache.http.legacy'
-    productFlavors {
-    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 dependencies {
-    //TODO 如果这些依赖和你项目中的依赖有冲突，则需要统一版本号，或者删除重复的依赖
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+
     api fileTree(include: ['*.jar'], dir: 'libs')
-    api 'com.android.support:appcompat-v7:27.1.1'
     api 'com.squareup.okhttp3:okhttp:3.11.0'
     api 'com.alibaba:fastjson:1.2.54'
     api 'com.github.bumptech.glide:glide:4.8.0'
 
-    api 'com.android.support:design:27.1.1'  //版本随意（必须）
     api 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.4-4' //版本随意（非必须，引用可以解决无法预览问题）
 }
diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseActivity.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseActivity.java
@@ -23,9 +23,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.Nullable;
 import android.view.GestureDetector;
 import android.view.GestureDetector.OnGestureListener;
 import android.view.KeyEvent;
@@ -39,6 +37,10 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseAdapter.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseAdapter.java
@@ -4,7 +4,7 @@
 import android.content.res.Resources;
 import android.database.DataSetObservable;
 import android.database.DataSetObserver;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseBottomTabActivity.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseBottomTabActivity.java
@@ -14,8 +14,8 @@
 
 package zuo.biao.library.base;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import android.view.View;
 import android.view.View.OnClickListener;
 

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseBroadcastReceiver.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseBroadcastReceiver.java
@@ -23,7 +23,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**基础广播接收器
  * @author Lemon

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseFragment.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseFragment.java
@@ -17,8 +17,8 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpRecyclerActivity.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpRecyclerActivity.java
@@ -14,7 +14,7 @@
 
 package zuo.biao.library.base;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.AdapterView;
 

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpRecyclerFragment.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseHttpRecyclerFragment.java
@@ -15,7 +15,7 @@
 package zuo.biao.library.base;
 
 import android.os.Bundle;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseRecyclerActivity.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseRecyclerActivity.java
@@ -14,10 +14,10 @@
 
 package zuo.biao.library.base;
 
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.Adapter;
-import android.support.v7.widget.RecyclerView.ViewHolder;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseRecyclerFragment.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseRecyclerFragment.java
@@ -15,10 +15,11 @@
 package zuo.biao.library.base;
 
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.Adapter;
-import android.support.v7.widget.RecyclerView.ViewHolder;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseTabActivity.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseTabActivity.java
@@ -19,9 +19,9 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseTabFragment.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseTabFragment.java
@@ -19,10 +19,10 @@
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseView.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseView.java
@@ -18,9 +18,9 @@
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/base/BaseViewBottomWindow.java b/ZBLibrary/src/main/java/zuo/biao/library/base/BaseViewBottomWindow.java
@@ -18,7 +18,7 @@
 import zuo.biao.library.interfaces.ViewPresenter;
 import zuo.biao.library.util.StringUtil;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/interfaces/ViewPresenter.java b/ZBLibrary/src/main/java/zuo/biao/library/interfaces/ViewPresenter.java
@@ -15,8 +15,8 @@
 package zuo.biao.library.interfaces;
 
 import android.app.Activity;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.Nullable;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.Nullable;
 
 import zuo.biao.library.ui.TopTabView;
 

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/ui/SelectPictureActivity.java b/ZBLibrary/src/main/java/zuo/biao/library/ui/SelectPictureActivity.java
@@ -21,12 +21,13 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.v4.content.FileProvider;
 import android.view.Gravity;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Toast;
 
+import androidx.core.content.FileProvider;
+
 import java.io.File;
 
 import zuo.biao.library.R;

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/ui/TopTabView.java b/ZBLibrary/src/main/java/zuo/biao/library/ui/TopTabView.java
@@ -22,7 +22,7 @@
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.res.Resources;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/ZBLibrary/src/main/java/zuo/biao/library/util/thread/pool/CacheThreadPool.java b/ZBLibrary/src/main/java/zuo/biao/library/util/thread/pool/CacheThreadPool.java
@@ -1,5 +1,6 @@
 package zuo.biao.library.util.thread.pool;
 
+import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Future;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -25,7 +26,7 @@ private void initThreadPoolExecutor(){
                     TimeUnit unit = TimeUnit.MILLISECONDS;
                     mExecutors = new ThreadPoolExecutor(
                             0
-                    , Integer.MAX_VALUE, keepAliveTime, unit, new SynchronousQueue<>());
+                    , Integer.MAX_VALUE, keepAliveTime, unit, (BlockingQueue)new SynchronousQueue<>());
                 }
             }
         }

diff --git a/ZBLibrary/src/main/res/layout/base_http_recycler_fragment.xml b/ZBLibrary/src/main/res/layout/base_http_recycler_fragment.xml
@@ -13,7 +13,7 @@
         style="@style/match_wrap"
        />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@id/rvBaseRecycler"
         style="@style/lv_no_divider"
         />

diff --git a/ZBLibrary/src/main/res/layout/base_recycler_fragment.xml b/ZBLibrary/src/main/res/layout/base_recycler_fragment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- BaseRecyclerXXX的子类布局layout中，RecyclerView必须有，且它的id必须按以下写法 -->
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@id/rvBaseRecycler"
     style="@style/lv_no_divider" />
diff --git a/ZBLibrary/src/main/res/layout/image_picker_activity.xml b/ZBLibrary/src/main/res/layout/image_picker_activity.xml
@@ -14,7 +14,7 @@
 
     <View style="@style/divider_horizontal_1dp" />
 
-    <android.support.v4.widget.DrawerLayout
+    <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/dlImagePicker"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -41,7 +41,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="start"
             android:background="@android:color/white" />
-    </android.support.v4.widget.DrawerLayout>
+    </androidx.drawerlayout.widget.DrawerLayout>
 
     <RelativeLayout
         android:layout_width="match_parent"

diff --git a/ZBLibrary/src/main/res/values/styles.xml b/ZBLibrary/src/main/res/values/styles.xml
@@ -506,7 +506,7 @@
     </style>
 
     <style name="content_item_rt_tv" parent="text_middle">
-        <item name="android:paddingLeft">@dimen/padding_big</item>
+        <item name="android:paddingRight">@dimen/padding_big</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:gravity">right|center_vertical</item>
     </style>