修改拦截器

Author: wyjsonGo

GoRouter/src/main/java/com/wyjson/router/callback/GoCallback.java

@@ -30,5 +30,5 @@ public interface GoCallback {
      *
      * @param card
      */
-    void onInterrupt(Card card);
+    void onInterrupt(Card card, Throwable exception);
 }

GoRouter/src/main/java/com/wyjson/router/callback/GoCallbackImpl.java

@@ -17,7 +17,7 @@ public void onLost(Card card) {
     public abstract void onArrival(Card card);
 
     @Override
-    public void onInterrupt(Card card) {
+    public void onInterrupt(Card card, Throwable exception) {
 
     }
 }

GoRouter/src/main/java/com/wyjson/router/core/GoRouter.java

@@ -229,9 +229,9 @@ public void onContinue(Card card) {
                             }
 
                             @Override
-                            public void onInterrupt(Throwable exception) {
+                            public void onInterrupt(Card card, Throwable exception) {
                                 if (callback != null) {
-                                    callback.onInterrupt(card);
+                                    callback.onInterrupt(card, exception);
                                 }
                             }
                         });

GoRouter/src/main/java/com/wyjson/router/interceptor/InterceptorCallback.java

@@ -6,5 +6,5 @@ public interface InterceptorCallback {
 
     void onContinue(Card card);
 
-    void onInterrupt(Throwable exception);
+    void onInterrupt(Card card, Throwable exception);
 }

GoRouter/src/main/java/com/wyjson/router/interceptor/service/impl/InterceptorServiceImpl.java

@@ -32,8 +32,8 @@ public void onContinue(Card card) {
                 }
 
                 @Override
-                public void onInterrupt(Throwable exception) {
-                    callback.onInterrupt(exception);
+                public void onInterrupt(Card card, Throwable exception) {
+                    callback.onInterrupt(card, exception);
                 }
             });
         } else {

GoRouter/src/main/java/com/wyjson/router/interfaces/IInterceptor.java

@@ -12,7 +12,7 @@ public interface IInterceptor {
 
     /**
      * {@link InterceptorCallback#onContinue(Card)} 继续执行
-     * {@link InterceptorCallback#onInterrupt(Throwable)}} 拦截
+     * {@link InterceptorCallback#onInterrupt(Card, Throwable)}} 拦截
      *
      * @param card
      * @param callback

README.md

@@ -140,8 +140,6 @@
             .putString("name")
             .putInt("age")
             .commit(TestActivity.class);
-
-
    ```
 
 3. 声明拦截器(拦截跳转过程，面向切面编程)
@@ -153,8 +151,8 @@
         @Override
         public void process(Card card, InterceptorCallback callback) {
             ...
-            callback.onContinue(card);  // 处理完成，交还控制权
-            // callback.onInterrupt(new RouterException("我觉得有点异常"));      // 觉得有问题，中断路由流程
+            callback.onContinue(card); // 处理完成，交还控制权
+            // callback.onInterrupt(card, new RouterException("我觉得有点异常")); // 觉得有问题，中断路由流程
 
             // 以上两种至少需要调用其中一种，否则不会继续路由
         }
@@ -167,7 +165,6 @@
 
 	 // 注册
     GoRouter.getInstance().addInterceptor(1, TestInterceptor.class);
-            
     ```
 
 4. 处理跳转结果
@@ -191,7 +188,7 @@
         }
 
         @Override
-        public void onInterrupt(Card card) {
+        public void onInterrupt(Card card, Throwable exception) {
 
         }
     });
@@ -215,8 +212,6 @@
 
     // 注册
     GoRouter.getInstance().addService(DegradeServiceImpl.class);
-
-    
     ```
 
 6. 为目标页面声明更多信息
@@ -228,7 +223,6 @@
     GoRouter.getInstance().build("/user/info/activity")
 	    .putTag(RouteTag.LOGIN.getValue() | RouteTag.AUTHENTICATION.getValue())
 	    .commit(UserInfoActivity.class);
-
     ```
 	Demo里[RouteTag.java](https://github.com/wyjsonGo/GoRouter/blob/master/module_common/src/main/java/com/wyjson/module_common/route/enums/RouteTag.java)已经实现了一个例子
 
@@ -256,7 +250,6 @@
 
     // 注册
     GoRouter.getInstance().addService(UserServiceImpl.class);
-
     ```
 
 8. 通过依赖注入解耦:服务管理(二) 发现服务

module_main/src/main/java/com/wyjson/module_main/activity/MainActivity.java

@@ -1,6 +1,7 @@
 package com.wyjson.module_main.activity;
 
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.Toast;
 
@@ -13,6 +14,8 @@
 import com.wyjson.module_common.route.service.user.UserService;
 import com.wyjson.module_main.R;
 import com.wyjson.module_main.databinding.MainActivityMainBinding;
+import com.wyjson.router.callback.GoCallback;
+import com.wyjson.router.core.Card;
 import com.wyjson.router.core.GoRouter;
 
 public class MainActivity extends FragmentActivity {
@@ -59,7 +62,29 @@ public void onClickParamFragment(View view) {
     }
 
     public void onClickUserInfoActivity(View view) {
-        GoRouter.getInstance().build(UserRoute.UserInfoActivity).go(this);
+        GoRouter.getInstance().build(UserRoute.UserInfoActivity).go(this, new GoCallback() {
+            @Override
+            public void onFound(Card card) {
+
+            }
+
+            @Override
+            public void onLost(Card card) {
+
+            }
+
+            @Override
+            public void onArrival(Card card) {
+
+            }
+
+            @Override
+            public void onInterrupt(Card card, Throwable exception) {
+                if (exception != null && !TextUtils.isEmpty(exception.getMessage())) {
+                    Toast.makeText(MainActivity.this, "onInterrupt:" + exception.getMessage(), Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
     }
 
     public void onClickUserService(View view) {

module_user/src/main/java/com/wyjson/module_user/route/interceptor/SignInInterceptor.java

@@ -22,7 +22,7 @@ public void process(Card card, InterceptorCallback callback) {
         if (RouteTag.isExist(card.getTag(), RouteTag.LOGIN) || card.getExtras().getBoolean(IS_LOGIN)) {
             if (true) {// 判断用户是否登录
                 GoRouter.getInstance().build(UserRoute.SignInActivity).go(card.getContext());
-                callback.onInterrupt(new RouterException("未登录"));
+                callback.onInterrupt(card, new RouterException("未登录,拦截自动跳转登录页!"));
                 return;
             }
         }