fixed not get super methods bug

mrsimple · mrsimple · commit cb6fbe862f0d · 2015-02-04T16:53:16.000+08:00
diff --git a/Simple_eventbus_demo/src/org/simple/eventbus/demo/fragment/BaseFragment.java b/Simple_eventbus_demo/src/org/simple/eventbus/demo/fragment/BaseFragment.java
@@ -0,0 +1,47 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014-2015 Umeng, Inc
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package org.simple.eventbus.demo.fragment;
+
+import android.support.v4.app.Fragment;
+import android.util.Log;
+
+import org.simple.eventbus.Subcriber;
+import org.simple.eventbus.demo.bean.User;
+
+/**
+ * @author mrsimple
+ */
+public class BaseFragment extends Fragment {
+
+    @Subcriber
+    private void protectedMethodInSuper(User user) {
+        Log.e(getTag(), "### supper protectedMethodInSuper invoked ( default tag )");
+    }
+
+    @Subcriber
+    private void privateMethodInSuper(User user) {
+        Log.e(getTag(), "### supper privateMethodInSuper invoked ( default tag ) ");
+    }
+}
diff --git a/Simple_eventbus_demo/src/org/simple/eventbus/demo/fragment/ConstactFragment.java b/Simple_eventbus_demo/src/org/simple/eventbus/demo/fragment/ConstactFragment.java
@@ -17,12 +17,11 @@
 package org.simple.eventbus.demo.fragment;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
@@ -40,7 +39,7 @@
 /**
  * @author mrsimple
  */
-public class ConstactFragment extends Fragment {
+public class ConstactFragment extends BaseFragment {
 
     BaseAdapter mAdapter;
     List<User> mConstacts = new LinkedList<User>();
diff --git a/Simple_eventbus_demo/src/org/simple/eventbus/demo/fragment/MenuFragment.java b/Simple_eventbus_demo/src/org/simple/eventbus/demo/fragment/MenuFragment.java
@@ -17,7 +17,6 @@
 package org.simple.eventbus.demo.fragment;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -36,7 +35,7 @@
 /**
  * @author mrsimple
  */
-public class MenuFragment extends Fragment {
+public class MenuFragment extends BaseFragment {
 
     public static final String CLICK_TAG = "click_user";
     /**
diff --git a/src/org/simple/eventbus/EventBus.java b/src/org/simple/eventbus/EventBus.java
@@ -127,7 +127,38 @@ public void register(Object subscriber) {
         if (subscriber == null) {
             return;
         }
-        final Method[] allMethods = subscriber.getClass().getDeclaredMethods();
+        // final Method[] allMethods =
+        // subscriber.getClass().getDeclaredMethods();
+        // for (int i = 0; i < allMethods.length; i++) {
+        // Method method = allMethods[i];
+        // // 根据注解来解析函数
+        // Subcriber annotation = method.getAnnotation(Subcriber.class);
+        // if (annotation != null) {
+        // // 获取方法参数
+        // Class<?>[] paramsTypeClass = method.getParameterTypes();
+        // // just only one param
+        // if (paramsTypeClass != null && paramsTypeClass.length == 1) {
+        // EventType event = new EventType(paramsTypeClass[0],
+        // annotation.tag());
+        // TargetMethod subscribeMethod = new TargetMethod(method,
+        // paramsTypeClass[0], annotation.mode());
+        // // 订阅事件
+        // subscibe(event, subscribeMethod, subscriber);
+        // }
+        // }
+        // } // end for
+
+        Class<?> clazz = subscriber.getClass();
+        while (!isObjectClass(clazz)) {
+            // 查找使用注解标注了的目标函数
+            findSubcribeMethods(clazz, subscriber);
+            // 查找完subscriber中复合要求的方法再查找父类中的方法,直至最顶层的object类
+            clazz = clazz.getSuperclass();
+        }
+    }
+
+    private void findSubcribeMethods(Class<?> clazz, Object subscriber) {
+        final Method[] allMethods = clazz.getDeclaredMethods();
         for (int i = 0; i < allMethods.length; i++) {
             Method method = allMethods[i];
             // 根据注解来解析函数
@@ -147,6 +178,10 @@ public void register(Object subscriber) {
         } // end for
     }
 
+    private boolean isObjectClass(Class<?> clazz) {
+        return clazz.getName().equals(Object.class.getName());
+    }
+
     /**
      * @param event
      * @param method
