RxTool 全面升级到 android X.

Tamsiree · Nov 23, 2019 · 6c2c5a7 · 6c2c5a7
1 parent 0657bec
commit 6c2c5a7
Show file tree

Hide file tree

Showing 113 changed files with 396 additions and 278 deletions.
diff --git a/RxArcGisKit/build.gradle b/RxArcGisKit/build.gradle
@@ -9,10 +9,15 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -23,10 +28,10 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    compileOnly 'com.android.support:appcompat-v7:28.0.0'
+    compileOnly 'androidx.appcompat:appcompat:1.0.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     compileOnly 'com.esri.arcgisruntime:arcgis-android:100.3.0'
     compileOnly project(':RxKit')
 }
diff --git a/RxCamera/build.gradle b/RxCamera/build.gradle
@@ -9,10 +9,15 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -31,10 +36,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     compileOnly project(':RxKit')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     compileOnly 'io.reactivex.rxjava2:rxjava:2.1.14'
     compileOnly 'io.reactivex.rxjava2:rxandroid:2.0.2'
 }
diff --git a/RxCamera/src/main/api14/com/vondear/camera/Camera1.java b/RxCamera/src/main/api14/com/vondear/camera/Camera1.java
@@ -4,9 +4,10 @@
 import android.graphics.SurfaceTexture;
 import android.hardware.Camera;
 import android.os.Build;
-import android.support.v4.util.SparseArrayCompat;
 import android.view.SurfaceHolder;
 
+import androidx.collection.SparseArrayCompat;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;

diff --git a/RxCamera/src/main/api21/com/vondear/camera/Camera2.java b/RxCamera/src/main/api21/com/vondear/camera/Camera2.java
@@ -14,11 +14,12 @@
 import android.hardware.camera2.params.StreamConfigurationMap;
 import android.media.Image;
 import android.media.ImageReader;
-import android.support.annotation.NonNull;
 import android.util.Log;
 import android.util.SparseIntArray;
 import android.view.Surface;
 
+import androidx.annotation.NonNull;
+
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Set;

diff --git a/RxCamera/src/main/api9/com/vondear/camera/SurfaceViewPreview.java b/RxCamera/src/main/api9/com/vondear/camera/SurfaceViewPreview.java
@@ -1,7 +1,7 @@
 package com.vondear.camera;
 
 import android.content.Context;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;

diff --git a/RxCamera/src/main/base/com/vondear/camera/AspectRatio.java b/RxCamera/src/main/base/com/vondear/camera/AspectRatio.java
@@ -2,8 +2,10 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.v4.util.SparseArrayCompat;
+
+import androidx.annotation.NonNull;
+import androidx.collection.SparseArrayCompat;
+
 
 /**
  * Immutable class for describing proportional relationship between width and height.

diff --git a/RxCamera/src/main/base/com/vondear/camera/Size.java b/RxCamera/src/main/base/com/vondear/camera/Size.java
@@ -1,6 +1,7 @@
 package com.vondear.camera;
 
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 /**
  * Immutable class for describing width and height dimensions in pixels.

diff --git a/RxCamera/src/main/base/com/vondear/camera/SizeMap.java b/RxCamera/src/main/base/com/vondear/camera/SizeMap.java
@@ -1,6 +1,7 @@
 package com.vondear.camera;
 
-import android.support.v4.util.ArrayMap;
+
+import androidx.collection.ArrayMap;
 
 import java.util.Set;
 import java.util.SortedSet;

diff --git a/RxCamera/src/main/java/com/vondear/camera/RxCameraView.java b/RxCamera/src/main/java/com/vondear/camera/RxCameraView.java
@@ -9,17 +9,18 @@
 import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.os.ParcelableCompat;
-import android.support.v4.os.ParcelableCompatCreatorCallbacks;
-import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.widget.FrameLayout;
 
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.os.ParcelableCompat;
+import androidx.core.os.ParcelableCompatCreatorCallbacks;
+import androidx.core.view.ViewCompat;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;

diff --git a/RxCamera/src/main/java/com/vondear/camera/tool/RxCameraTool.java b/RxCamera/src/main/java/com/vondear/camera/tool/RxCameraTool.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.hardware.Camera;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
 import com.vondear.camera.RxCameraView;
@@ -26,6 +25,7 @@
 import io.reactivex.ObservableOnSubscribe;
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.annotations.NonNull;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 
@@ -40,8 +40,6 @@ public class RxCameraTool {
 
     /**
      * 打开闪光灯
-     *
-     * @return
      */
     public static void openFlashLight() {
         try {
@@ -60,7 +58,6 @@ public static void openFlashLight() {
     /**
      * 关闭闪光灯
      *
-     * @return
      */
     public static void closeFlashLight() {
         try {
@@ -83,7 +80,11 @@ public static void takePic(Context mContext, final RxCameraView mCameraView) {
             if (mCameraView.isCameraOpened()) {
                 RxVibrateTool.vibrateOnce(mContext, 150);
                 RxToast.normal("正在拍照..");
-                mCameraView.takePicture();
+                try {
+                    mCameraView.takePicture();
+                } catch (Exception var2) {
+                    RxToast.normal("你碰到问题咯");
+                }
             } else {
                 mCameraView.start();
                 RxVibrateTool.vibrateOnce(mContext, 150);

diff --git a/RxDemo/build.gradle b/RxDemo/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.jakewharton.butterknife'
 
 android {
 
@@ -11,6 +12,12 @@ android {
         versionName "1.0.0"
         multiDexEnabled true
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -34,16 +41,16 @@ dependencies {
     //流式布局
     //动画向下版本兼容 nineold包
     //noinspection GradleCompatible
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.android.support:support-annotations:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.google.android:flexbox:0.3.2'
-    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.nineoldandroids:library:2.4.0'
-    implementation 'com.jakewharton:butterknife:8.8.1'
+
     implementation 'com.github.bumptech.glide:glide:4.7.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
     implementation 'jp.wasabeef:glide-transformations:3.3.0'
@@ -54,7 +61,16 @@ dependencies {
     implementation 'com.afollestad.material-dialogs:core:0.9.3.0'
 //    implementation 'com.github.google:cameraview:3eaeac09a7'
     implementation 'com.orhanobut:logger:2.2.0'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+
+    implementation 'com.jakewharton:butterknife:10.2.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'
+
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+// Because RxAndroid releases are few and far between, it is recommended you also
+// explicitly depend on RxJava's latest version for bug fixes and new features.
+// (see https://github.com/ReactiveX/RxJava/releases for latest 2.x.x version)
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.14'
+
     configurations.all {
         exclude group: 'com.android.support', module: 'support-v13'
     }

diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/ApplicationRxTools.java b/RxDemo/src/main/java/com/vondear/rxdemo/ApplicationRxTools.java
@@ -2,7 +2,8 @@
 
 import android.app.Application;
 import android.content.Context;
-import android.support.multidex.MultiDex;
+
+import androidx.multidex.MultiDex;
 
 import com.vondear.rxtool.RxTool;
 

diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityCardStack.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityCardStack.java
@@ -1,12 +1,13 @@
 package com.vondear.rxdemo.activity;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.LinearLayout;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.vondear.rxdemo.R;
 import com.vondear.rxdemo.adapter.AdapterStackTest;
 import com.vondear.rxtool.RxTool;

diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityContact.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityContact.java
@@ -1,19 +1,20 @@
 package com.vondear.rxdemo.activity;
 
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.vondear.rxdemo.R;
-import com.vondear.rxui.view.wavesidebar.adapter.AdapterContactCity;
-import com.vondear.rxui.model.ModelContactCity;
-import com.vondear.rxui.view.wavesidebar.ComparatorLetter;
 import com.vondear.rxui.activity.ActivityBase;
+import com.vondear.rxui.model.ModelContactCity;
 import com.vondear.rxui.view.RxTitle;
+import com.vondear.rxui.view.wavesidebar.ComparatorLetter;
 import com.vondear.rxui.view.wavesidebar.PinnedHeaderDecoration;
 import com.vondear.rxui.view.wavesidebar.WaveSideBarView;
+import com.vondear.rxui.view.wavesidebar.adapter.AdapterContactCity;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;

diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityELMe.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityELMe.java
@@ -5,8 +5,6 @@
 import android.animation.ObjectAnimator;
 import android.graphics.PointF;
 import android.os.Bundle;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
@@ -19,6 +17,9 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.vondear.rxdemo.R;
 import com.vondear.rxdemo.adapter.AdapterLeftMenu;
 import com.vondear.rxdemo.adapter.AdapterRightDish;

diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoading.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoading.java
@@ -1,11 +1,12 @@
 package com.vondear.rxdemo.activity;
 
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
+import com.google.android.material.tabs.TabLayout;
 import com.vondear.rxdemo.R;
 import com.vondear.rxdemo.fragment.FragmentLoadingDemo;
 import com.vondear.rxdemo.fragment.FragmentLoadingWay;

diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoadingDetail.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoadingDetail.java
@@ -4,14 +4,15 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
 import com.vondear.rxdemo.R;
 import com.vondear.rxdemo.tools.EvaluatorARGB;
 import com.vondear.rxui.view.progressing.SpinKitView;

diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLocation.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLocation.java
@@ -8,12 +8,13 @@
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+
 import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.vondear.rxdemo.R;

diff --git a/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoginAct.java b/RxDemo/src/main/java/com/vondear/rxdemo/activity/ActivityLoginAct.java
@@ -3,7 +3,7 @@
 import android.animation.ObjectAnimator;
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.widget.NestedScrollView;
+import androidx.core.widget.NestedScrollView;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;