From 330702f0698e581bc94feba2956101297cffc014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AD=A3=E7=BA=AC?= <zhilong.lzl@alibaba-inc.com>
Date: Tue, 21 Mar 2017 20:54:46 +0800
Subject: [PATCH] Add fragment support.

---
 README.md                                          |  4 ++++
 README_CN.md                                       |  4 ++++
 .../android/arouter/demo/BlankFragment.java        |  2 ++
 .../alibaba/android/arouter/demo/MainActivity.java |  5 +++++
 app/src/main/res/layout/activity_main.xml          |  7 +++++++
 .../android/arouter/core/LogisticsCenter.java      |  2 ++
 .../alibaba/android/arouter/launcher/_ARouter.java | 14 ++++++++++++++
 .../arouter/compiler/processor/RouteProcessor.java |  8 ++++++--
 gradle.properties                                  |  4 ++--
 9 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 622e1e7a..0c65aa9a 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,7 @@
 8. 支持用户指定全局降级与局部降级策略
 9. 页面、拦截器、服务等组件均自动注册到框架
 10. 支持多种方式配置转场动画
+11. 支持获取Fragment
 
 #### 二、典型应用
 1. 从外部URL映射到内部页面，以及参数传递与解析
@@ -298,6 +299,9 @@
 					.withFlags();
 					.navigation();
 					
+		// 获取Fragment
+		Fragment fragment = (Fragment) ARouter.getInstance().build("/test/fragment").navigation();
+					
 	    // 对象传递
 	    ARouter.getInstance()
 	                .withObject("key", new TestObj("Jack", "Rose"))
diff --git a/README_CN.md b/README_CN.md
index 7c097f9a..a840b9b2 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -27,6 +27,7 @@
 8. 支持用户指定全局降级与局部降级策略
 9. 页面、拦截器、服务等组件均自动注册到框架
 10. 支持多种方式配置转场动画
+11. 支持获取Fragment
 
 #### 二、典型应用
 1. 从外部URL映射到内部页面，以及参数传递与解析
@@ -300,6 +301,9 @@
 	    ARouter.getInstance()
 	                .withObject("key", new TestObj("Jack", "Rose"))
 	                .navigation();
+	                
+        // 获取Fragment
+        Fragment fragment = (Fragment) ARouter.getInstance().build("/test/fragment").navigation();
 
 		// 觉得接口不够多，可以直接拿出Bundle赋值
 		ARouter.getInstance()
diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/BlankFragment.java b/app/src/main/java/com/alibaba/android/arouter/demo/BlankFragment.java
index 88f11a36..8b64afbf 100644
--- a/app/src/main/java/com/alibaba/android/arouter/demo/BlankFragment.java
+++ b/app/src/main/java/com/alibaba/android/arouter/demo/BlankFragment.java
@@ -9,10 +9,12 @@
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.facade.annotation.Autowired;
+import com.alibaba.android.arouter.facade.annotation.Route;
 
 /**
  * A simple {@link Fragment} subclass.
  */
+@Route(path = "/test/fragment")
 public class BlankFragment extends Fragment {
 
     @Autowired
diff --git a/app/src/main/java/com/alibaba/android/arouter/demo/MainActivity.java b/app/src/main/java/com/alibaba/android/arouter/demo/MainActivity.java
index 2d1cce8d..cbc7ae93 100644
--- a/app/src/main/java/com/alibaba/android/arouter/demo/MainActivity.java
+++ b/app/src/main/java/com/alibaba/android/arouter/demo/MainActivity.java
@@ -5,6 +5,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.ActivityOptionsCompat;
+import android.support.v4.app.Fragment;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
@@ -151,6 +152,10 @@ public void onLost(Postcard postcard) {
                         .build("/test/activity2")
                         .navigation(this, 666);
                 break;
+            case R.id.getFragment:
+                Fragment fragment = (Fragment) ARouter.getInstance().build("/test/fragment").navigation();
+                Toast.makeText(this, "找到Fragment:" + fragment.toString(), Toast.LENGTH_SHORT).show();
+                break;
             default:
                 break;
         }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 82b64231..52a86809 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -88,6 +88,13 @@
                 android:onClick="onClick"
                 android:text="跳转ForResult" />
 
+            <Button
+                android:id="@+id/getFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:onClick="onClick"
+                android:text="获取Fragment实例" />
+
             <Button
                 android:id="@+id/normalNavigationWithParams"
                 android:layout_width="match_parent"
diff --git a/arouter-api/src/main/java/com/alibaba/android/arouter/core/LogisticsCenter.java b/arouter-api/src/main/java/com/alibaba/android/arouter/core/LogisticsCenter.java
index ee84bef5..53b0ef6d 100644
--- a/arouter-api/src/main/java/com/alibaba/android/arouter/core/LogisticsCenter.java
+++ b/arouter-api/src/main/java/com/alibaba/android/arouter/core/LogisticsCenter.java
@@ -184,6 +184,8 @@ public synchronized static void completion(Postcard postcard) {
                     postcard.setProvider(instance);
                     postcard.greenChannel();    // Provider should skip all of interceptors
                     break;
+                case FRAGMENT:
+                    postcard.greenChannel();    // Fragment needn't interceptors
                 default:
                     break;
             }
diff --git a/arouter-api/src/main/java/com/alibaba/android/arouter/launcher/_ARouter.java b/arouter-api/src/main/java/com/alibaba/android/arouter/launcher/_ARouter.java
index 6671f553..5b0d96c0 100644
--- a/arouter-api/src/main/java/com/alibaba/android/arouter/launcher/_ARouter.java
+++ b/arouter-api/src/main/java/com/alibaba/android/arouter/launcher/_ARouter.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.app.Application;
+import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -360,6 +361,19 @@ public void run() {
             case BOARDCAST:
             case CONTENT_PROVIDER:
             case FRAGMENT:
+                Class fragmentMeta = postcard.getDestination();
+                try {
+                    Object instance = fragmentMeta.getConstructor().newInstance();
+                    if (instance instanceof Fragment) {
+                        ((Fragment) instance).setArguments(postcard.getExtras());
+                    } else if (instance instanceof android.support.v4.app.Fragment) {
+                        ((android.support.v4.app.Fragment) instance).setArguments(postcard.getExtras());
+                    }
+
+                    return instance;
+                } catch (Exception ex) {
+                    logger.error(Consts.TAG, "Navigation to fragment error, " + TextUtils.formatStackTrace(ex.getStackTrace()));
+                }
             case METHOD:
             case SERVICE:
             default:
diff --git a/arouter-compiler/src/main/java/com/alibaba/android/arouter/compiler/processor/RouteProcessor.java b/arouter-compiler/src/main/java/com/alibaba/android/arouter/compiler/processor/RouteProcessor.java
index 6b6a485a..0c849233 100644
--- a/arouter-compiler/src/main/java/com/alibaba/android/arouter/compiler/processor/RouteProcessor.java
+++ b/arouter-compiler/src/main/java/com/alibaba/android/arouter/compiler/processor/RouteProcessor.java
@@ -47,6 +47,7 @@
 import static com.alibaba.android.arouter.compiler.utils.Consts.ACTIVITY;
 import static com.alibaba.android.arouter.compiler.utils.Consts.ANNOTATION_TYPE_AUTOWIRED;
 import static com.alibaba.android.arouter.compiler.utils.Consts.ANNOTATION_TYPE_ROUTE;
+import static com.alibaba.android.arouter.compiler.utils.Consts.FRAGMENT;
 import static com.alibaba.android.arouter.compiler.utils.Consts.IPROVIDER_GROUP;
 import static com.alibaba.android.arouter.compiler.utils.Consts.IROUTE_GROUP;
 import static com.alibaba.android.arouter.compiler.utils.Consts.ITROUTE_ROOT;
@@ -56,7 +57,6 @@
 import static com.alibaba.android.arouter.compiler.utils.Consts.NAME_OF_PROVIDER;
 import static com.alibaba.android.arouter.compiler.utils.Consts.NAME_OF_ROOT;
 import static com.alibaba.android.arouter.compiler.utils.Consts.PACKAGE_OF_GENERATE_FILE;
-import static com.alibaba.android.arouter.compiler.utils.Consts.PARCELABLE;
 import static com.alibaba.android.arouter.compiler.utils.Consts.SEPARATOR;
 import static com.alibaba.android.arouter.compiler.utils.Consts.SERVICE;
 import static com.alibaba.android.arouter.compiler.utils.Consts.WARNING_TIPS;
@@ -164,7 +164,8 @@ private void parseRoutes(Set<? extends Element> routeElements) throws IOExceptio
 
             TypeMirror type_Activity = elements.getTypeElement(ACTIVITY).asType();
             TypeMirror type_Service = elements.getTypeElement(SERVICE).asType();
-            TypeElement type_Parcelable = elements.getTypeElement(PARCELABLE);
+            TypeMirror fragmentTm = elements.getTypeElement(FRAGMENT).asType();
+            TypeMirror fragmentTmV4 = elements.getTypeElement(Consts.FRAGMENT_V4).asType();
 
             // Interface of ARouter
             TypeElement type_IRouteGroup = elements.getTypeElement(IROUTE_GROUP);
@@ -236,6 +237,9 @@ private void parseRoutes(Set<? extends Element> routeElements) throws IOExceptio
                 } else if (types.isSubtype(tm, type_Service)) {           // Service
                     logger.info(">>> Found service route: " + tm.toString() + " <<<");
                     routeMete = new RouteMeta(route, element, RouteType.parse(SERVICE), null);
+                } else if (types.isSubtype(tm, fragmentTm) || types.isSubtype(tm, fragmentTmV4)) {
+                    logger.info(">>> Found fragment route: " + tm.toString() + " <<<");
+                    routeMete = new RouteMeta(route, element, RouteType.parse(FRAGMENT), null);
                 }
 
                 categories(routeMete);
diff --git a/gradle.properties b/gradle.properties
index e2074f5b..d9412ca4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,8 +24,8 @@ SUPPORT_LIB_VERSION=25.2.0
 MIN_SDK_VERSION=12
 TARGET_SDK_VERSION=25
 
-arouter_compiler_version=1.0.4
-arouter_api_version=1.1.0
+arouter_compiler_version=1.0.5
+arouter_api_version=1.1.1
 arouter_annotation_version=1.0.3
 
 bintrayRepo=maven