增加onInterceptStartIntent回调

hss01248 · Feb 23, 2022 · f49ec22 · f49ec22
1 parent 05f1949
commit f49ec22
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -53,6 +53,48 @@ start a activity and set data in it's onCreate listener, rather then send data b
 
 and get result in listener, not in activity's onActivityResult callback
 
+## 接口定义:
+
+```java
+public interface ActivityResultListener {
+
+    /**
+     *
+     * @param fragment
+     * @param intent
+     * @return 返回值代表是否拦截原默认行为. 如果
+     * 调用处为: if(!listener.onInterceptStartIntent(this,bean)){
+     *                 startActivityForResult(bean,requestCode);
+     *             }
+     */
+    default boolean onInterceptStartIntent(@NonNull Fragment fragment, @Nullable Intent intent, int requestCode){
+        return false;
+    }
+
+    /**
+     * 在里面自己处理
+     * @param requestCode
+     * @param resultCode
+     * @param data
+     */
+     void onActivityResult(int requestCode, int resultCode, @Nullable Intent data);
+
+
+
+
+
+     void onActivityNotFound(Throwable e) ;
+}
+```
+
+
+
+
+
+
+
+
+
 ```
 StartActivityUtil.startActivity(this, ActivityDemo2.class, null,true,
         new TheActivityListener<ActivityDemo2>() {

diff --git a/activityresult/build.gradle b/activityresult/build.gradle
@@ -21,6 +21,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
 }
 

diff --git a/activityresult/src/main/java/com/hss01248/activityresult/ActivityResultListener.java b/activityresult/src/main/java/com/hss01248/activityresult/ActivityResultListener.java
@@ -4,7 +4,9 @@
 import android.content.Intent;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
 /**
  * time:2020/4/30
@@ -13,6 +15,19 @@
  */
 public interface ActivityResultListener {
 
+    /**
+     *
+     * @param fragment
+     * @param intent
+     * @return 返回值代表是否拦截原默认行为. 如果
+     * 调用处为: if(!listener.onInterceptStartIntent(this,bean)){
+     *                 startActivityForResult(bean,requestCode);
+     *             }
+     */
+    default boolean onInterceptStartIntent(@NonNull Fragment fragment, @Nullable Intent intent, int requestCode){
+        return false;
+    }
+
     /**
      * 在里面自己处理
      * @param requestCode

diff --git a/activityresult/src/main/java/com/hss01248/activityresult/GoOutOfAppForResultFragment.java b/activityresult/src/main/java/com/hss01248/activityresult/GoOutOfAppForResultFragment.java
@@ -30,7 +30,9 @@ public void goOutApp(ActivityResultListener listener){
         requestCode = new Random().nextInt(8799);
         this.listener = listener;
         try {
-            startActivityForResult(bean,requestCode);
+            if(!listener.onInterceptStartIntent(this,bean,requestCode)){
+                startActivityForResult(bean,requestCode);
+            }
         }catch (Throwable throwable){
             listener.onActivityNotFound(throwable);
             finish();

diff --git a/activityresult/src/main/java/com/hss01248/activityresult/InAppResultFragment.java b/activityresult/src/main/java/com/hss01248/activityresult/InAppResultFragment.java
@@ -20,10 +20,15 @@ public InAppResultFragment(FragmentActivity activity, Intent intent) {
         super(activity, intent);
     }
     ActivityResultListener listener;
+    int requestCode;
     public void startActivityForResult(ActivityResultListener listener){
         try {
             this.listener = listener;
-            startActivityForResult(bean,new Random().nextInt(589));
+            requestCode = new Random().nextInt(589);
+            if(!listener.onInterceptStartIntent(this,bean,requestCode)){
+                startActivityForResult(bean,requestCode);
+            }
+
         }catch (Throwable e){
             listener.onActivityNotFound(e);
             if(StartActivityUtil.debugable){
@@ -40,6 +45,15 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
         }
         listener.onActivityResult(requestCode,resultCode,data);
         finish();
+        if(requestCode == this.requestCode){
+            //listener.onActivityResult(requestCode,resultCode,data);
+            //finish();
+        }else {
+            if (StartActivityUtil.debugable) {
+                Log.w("onActivityResult", "reqcode not same:" + requestCode + ",this.requestCode:" + this.requestCode );
+            }
+        }
+
 
     }
 }