update RxActivityTool.

Tamsiree · Mar 17, 2020 · 242ab8c · 242ab8c
1 parent a9812b6
commit 242ab8c
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 27 deletions.
diff --git a/RxDemo/build.gradle b/RxDemo/build.gradle
@@ -1,10 +1,14 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.jakewharton.butterknife'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt' //kapt3插件
+//apply plugin: 'com.jakewharton.butterknife'
 apply plugin: 'kotlin-android-extensions'
 
 android {
 
+    compileSdkVersion 29
+    buildToolsVersion = '29.0.3'
+
     signingConfigs {
         debug {
             storeFile file('/home/tamsiree/Documents/TamDocuments/WorkSpace/Android/TamKey.jks')
@@ -13,8 +17,7 @@ android {
             keyPassword 'Ls547817'
         }
     }
-    compileSdkVersion 29
-    buildToolsVersion = '29.0.3'
+
 
     defaultConfig {
         applicationId "com.tamsiree.rxdemo"
@@ -82,7 +85,8 @@ dependencies {
     implementation 'com.orhanobut:logger:2.2.0'
 
     implementation 'com.jakewharton:butterknife:10.2.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
+//    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
+    kapt 'com.jakewharton:butterknife-compiler:10.2.1'
 
     compileOnly 'com.alipay.sdk:alipay-sdk-java:4.9.28.ALL'
 

diff --git a/RxDemo/src/main/java/com/tamsiree/rxdemo/activity/ActivitySVG.java b/RxDemo/src/main/java/com/tamsiree/rxdemo/activity/ActivitySVG.java
@@ -61,8 +61,7 @@ private void setSvg(ModelSVG modelSvg) {
                     mTvAppName.setVisibility(View.VISIBLE);
                     mTvVersion.setVisibility(View.VISIBLE);
                     RxTool.delayToDo(2000, () -> {
-                        RxActivityTool.skipActivityAndFinish(mContext, ActivityMain.class);
-                        overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);
+                        RxActivityTool.skipActivityAndFinish(mContext, ActivityMain.class, true);
                     });
                     break;
                 default:

diff --git a/RxDemo/src/main/res/layout/activity_svg.xml b/RxDemo/src/main/res/layout/activity_svg.xml
@@ -5,6 +5,7 @@
     android:id="@+id/activity_svg"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:animateLayoutChanges="true"
     tools:context="com.tamsiree.rxdemo.activity.ActivitySVG">
 
     <com.tamsiree.rxui.view.RxAutoImageView

diff --git a/RxKit/src/main/java/com/tamsiree/rxkit/RxActivityTool.java b/RxKit/src/main/java/com/tamsiree/rxkit/RxActivityTool.java
@@ -146,6 +146,7 @@ public static void launchActivity(Context context, String packageName, String cl
         context.startActivity(RxIntentTool.getComponentNameIntent(packageName, className, bundle));
     }
 
+
     /**
      * 要求最低API为11
      * Activity 跳转
@@ -154,17 +155,8 @@ public static void launchActivity(Context context, String packageName, String cl
      * @param context Context
      * @param goal    Activity
      */
-    public static void skipActivityAndFinishAll(Context context, Class<?> goal, Bundle bundle, boolean isFade) {
-        Intent intent = new Intent(context, goal);
-        if (bundle != null) {
-            intent.putExtras(bundle);
-        }
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        context.startActivity(intent);
-        finishActivity(context, false);
-        if (isFade) {
-            fadeTransition(context);
-        }
+    public static void skipActivityAndFinishAll(Context context, Class<?> goal) {
+        skipActivityAndFinishAll(context, goal, null, false);
     }
 
     /**
@@ -187,8 +179,17 @@ public static void skipActivityAndFinishAll(Context context, Class<?> goal, bool
      * @param context Context
      * @param goal    Activity
      */
-    public static void skipActivityAndFinishAll(Context context, Class<?> goal) {
-        skipActivityAndFinishAll(context, goal, null, false);
+    public static void skipActivityAndFinishAll(Context context, Class<?> goal, Bundle bundle, boolean isFade) {
+        Intent intent = new Intent(context, goal);
+        if (bundle != null) {
+            intent.putExtras(bundle);
+        }
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        context.startActivity(intent);
+        finishActivity(context, false);
+        if (isFade) {
+            fadeTransition(context);
+        }
     }
 
     /**
@@ -197,9 +198,9 @@ public static void skipActivityAndFinishAll(Context context, Class<?> goal) {
      * @param context Context
      * @param goal    Activity
      */
-    public static void skipActivityAndFinish(Context context, Class<?> goal, Bundle bundle, boolean isFade, boolean isTransition) {
-        skipActivity(context, goal, bundle, isFade);
-        finishActivity(context, isTransition);
+    public static void skipActivityAndFinish(Context context, Class<?> goal) {
+        skipActivity(context, goal, null, false);
+        finishActivity(context, false);
     }
 
     /**
@@ -208,8 +209,8 @@ public static void skipActivityAndFinish(Context context, Class<?> goal, Bundle
      * @param context Context
      * @param goal    Activity
      */
-    public static void skipActivityAndFinish(Context context, Class<?> goal, Bundle bundle) {
-        skipActivity(context, goal, bundle, false);
+    public static void skipActivityAndFinish(Context context, Class<?> goal, boolean isFade) {
+        skipActivity(context, goal, null, isFade);
         finishActivity(context, false);
     }
 
@@ -219,8 +220,8 @@ public static void skipActivityAndFinish(Context context, Class<?> goal, Bundle
      * @param context Context
      * @param goal    Activity
      */
-    public static void skipActivityAndFinish(Context context, Class<?> goal) {
-        skipActivity(context, goal, null, false);
+    public static void skipActivityAndFinish(Context context, Class<?> goal, Bundle bundle) {
+        skipActivity(context, goal, bundle, false);
         finishActivity(context, false);
     }
 
@@ -235,6 +236,18 @@ public static void skipActivityAndFinish(Context context, Class<?> goal, boolean
         finishActivity(context, isTransition);
     }
 
+    /**
+     * Activity 跳转
+     *
+     * @param context Context
+     * @param goal    Activity
+     */
+    public static void skipActivityAndFinish(Context context, Class<?> goal, Bundle bundle, boolean isFade, boolean isTransition) {
+        skipActivity(context, goal, bundle, isFade);
+        finishActivity(context, isTransition);
+    }
+
+
     /**
      * Activity 跳转
      *
@@ -245,6 +258,20 @@ public static void skipActivity(Context context, Class<?> goal) {
         skipActivity(context, goal, null, false);
     }
 
+    /**
+     * Activity 跳转
+     *
+     * @param context Context
+     * @param goal    Activity
+     */
+    public static void skipActivity(Context context, Class<?> goal, Bundle bundle) {
+        Intent intent = new Intent(context, goal);
+        if (bundle != null) {
+            intent.putExtras(bundle);
+        }
+        context.startActivity(intent);
+    }
+
     /**
      * Activity 跳转
      *

diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.1'
         classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
-        classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.1'
+//        classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 //        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         // NOTE: Do not place your application dependencies here; they belong