传入parcelables数据形式从Map改为Bundle #40

Author: Qunhe

activityrouter/src/main/java/com/github/mzule/activityrouter/router/Routers.java

@@ -4,13 +4,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Parcelable;
+import android.os.Bundle;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by CaoDongping on 4/6/16.
@@ -48,67 +47,67 @@ public static boolean open(Context context, String url) {
         return open(context, Uri.parse(url), null, getGlobalCallback(context));
     }
 
-    public static boolean open(Context context, String url, Map<String, Parcelable> parcelableMap) {
-        return open(context, Uri.parse(url), parcelableMap, getGlobalCallback(context));
+    public static boolean open(Context context, String url, Bundle bundle) {
+        return open(context, Uri.parse(url), bundle, getGlobalCallback(context));
     }
 
     public static boolean open(Context context, String url, RouterCallback callback) {
         return open(context, Uri.parse(url), null, callback);
     }
 
-    public static boolean open(Context context, String url, Map<String, Parcelable> parcelableMap, RouterCallback callback) {
-        return open(context, Uri.parse(url), parcelableMap, callback);
+    public static boolean open(Context context, String url, Bundle bundle, RouterCallback callback) {
+        return open(context, Uri.parse(url), bundle, callback);
     }
 
     public static boolean open(Context context, Uri uri) {
         return open(context, uri, null, getGlobalCallback(context));
     }
 
-    public static boolean open(Context context, Uri uri, Map<String, Parcelable> parcelableMap) {
-        return open(context, uri, parcelableMap, getGlobalCallback(context));
+    public static boolean open(Context context, Uri uri, Bundle bundle) {
+        return open(context, uri, bundle, getGlobalCallback(context));
     }
 
     public static boolean open(Context context, Uri uri, RouterCallback callback) {
         return open(context, uri, null, callback);
     }
 
-    public static boolean open(Context context, Uri uri, Map<String, Parcelable> parcelableMap, RouterCallback callback) {
-        return open(context, uri, parcelableMap, -1, callback);
+    public static boolean open(Context context, Uri uri, Bundle bundle, RouterCallback callback) {
+        return open(context, uri, bundle, -1, callback);
     }
 
     public static boolean openForResult(Context context, String url, int requestCode) {
         return openForResult(context, Uri.parse(url), null, requestCode, getGlobalCallback(context));
     }
 
-    public static boolean openForResult(Context context, String url, Map<String, Parcelable> parcelableMap, int requestCode) {
-        return openForResult(context, Uri.parse(url), parcelableMap, requestCode, getGlobalCallback(context));
+    public static boolean openForResult(Context context, String url, Bundle bundle, int requestCode) {
+        return openForResult(context, Uri.parse(url), bundle, requestCode, getGlobalCallback(context));
     }
 
     public static boolean openForResult(Context context, String url, int requestCode, RouterCallback callback) {
         return openForResult(context, Uri.parse(url), null, requestCode, callback);
     }
 
-    public static boolean openForResult(Context context, String url, Map<String, Parcelable> parcelableMap, int requestCode, RouterCallback callback) {
-        return openForResult(context, Uri.parse(url), parcelableMap, requestCode, callback);
+    public static boolean openForResult(Context context, String url, Bundle bundle, int requestCode, RouterCallback callback) {
+        return openForResult(context, Uri.parse(url), bundle, requestCode, callback);
     }
 
     public static boolean openForResult(Context context, Uri uri, int requestCode) {
         return openForResult(context, uri, null, requestCode, getGlobalCallback(context));
     }
 
-    public static boolean openForResult(Context context, Uri uri, Map<String, Parcelable> parcelableMap, int requestCode) {
-        return openForResult(context, uri, parcelableMap, requestCode, getGlobalCallback(context));
+    public static boolean openForResult(Context context, Uri uri, Bundle bundle, int requestCode) {
+        return openForResult(context, uri, bundle, requestCode, getGlobalCallback(context));
     }
 
     public static boolean openForResult(Context context, Uri uri, int requestCode, RouterCallback callback) {
         return openForResult(context, uri, null, requestCode, callback);
     }
 
-    public static boolean openForResult(Context context, Uri uri, Map<String, Parcelable> parcelableMap, int requestCode, RouterCallback callback) {
-        return open(context, uri, parcelableMap, requestCode, callback);
+    public static boolean openForResult(Context context, Uri uri, Bundle bundle, int requestCode, RouterCallback callback) {
+        return open(context, uri, bundle, requestCode, callback);
     }
 
-    private static boolean open(Context context, Uri uri, Map<String, Parcelable> parcelableMap, int requestCode, RouterCallback callback) {
+    private static boolean open(Context context, Uri uri, Bundle bundle, int requestCode, RouterCallback callback) {
         boolean success = false;
         if (callback != null) {
             if (callback.beforeOpen(context, uri)) {
@@ -117,7 +116,7 @@ private static boolean open(Context context, Uri uri, Map<String, Parcelable> pa
         }
 
         try {
-            success = doOpen(context, uri, parcelableMap, requestCode);
+            success = doOpen(context, uri, bundle, requestCode);
         } catch (Throwable e) {
             e.printStackTrace();
             if (callback != null) {
@@ -153,7 +152,7 @@ public static Intent resolve(Context context, Uri uri) {
         return null;
     }
 
-    private static boolean doOpen(Context context, Uri uri, Map<String, Parcelable> parcelableMap, int requestCode) {
+    private static boolean doOpen(Context context, Uri uri, Bundle bundle, int requestCode) {
         initIfNeed();
         Path path = Path.create(uri);
         for (Mapping mapping : mappings) {
@@ -165,10 +164,8 @@ private static boolean doOpen(Context context, Uri uri, Map<String, Parcelable>
                 Intent intent = new Intent(context, mapping.getActivity());
                 intent.putExtras(mapping.parseExtras(uri));
                 intent.putExtra(KEY_RAW_URL, uri.toString());
-                if (parcelableMap != null) {
-                    for (Map.Entry<String, Parcelable> entry : parcelableMap.entrySet()) {
-                        intent.putExtra(entry.getKey(), entry.getValue());
-                    }
+                if (bundle != null) {
+                    intent.putExtras(bundle);
                 }
                 if (!(context instanceof Activity)) {
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

app/src/main/java/com/github/mzule/activityrouter/LaunchActivity.java

@@ -3,7 +3,6 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.os.Parcelable;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
@@ -12,9 +11,6 @@
 
 import com.github.mzule.activityrouter.router.Routers;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Created by CaoDongping on 4/7/16.
  */
@@ -50,9 +46,9 @@ public void onClick(View v) {
         pojoText.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(final View view) {
-                Map<String, Parcelable> map = new HashMap<>();
-                map.put("POJO", new PojoData("CPPAlien", 5));
-                Routers.open(LaunchActivity.this, pojoText.getText().toString(), map);
+                Bundle bundle = new Bundle();
+                bundle.putParcelable("POJO", new PojoData("CPPAlien", 5));
+                Routers.open(LaunchActivity.this, pojoText.getText().toString(), bundle);
             }
         });
     }