修复新事件注入模型在同一页面多个控件parentId和id相同时覆盖的问题

wyouflf · wyouflf · commit a14d938d5b70 · 2014-04-14T11:43:31.000+08:00
diff --git a/library/src/com/lidroid/xutils/view/ViewEventListenerManager.java b/library/src/com/lidroid/xutils/view/ViewEventListenerManager.java
@@ -21,6 +21,7 @@
 import com.lidroid.xutils.view.annotation.event.EventBase;
 
 import java.lang.annotation.Annotation;
+import java.lang.ref.WeakReference;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
@@ -49,30 +50,32 @@ public static void addEventMethod(
             View view = finder.findViewByInfo(info);
             if (view != null) {
                 EventBase eventBase = eventAnnotation.annotationType().getAnnotation(EventBase.class);
-                Class<?> eventListenerType = eventBase.eventListenerType();
-                String eventListenerSetter = eventBase.eventListenerSetter();
+                Class<?> listenerType = eventBase.listenerType();
+                String listenerSetter = eventBase.listenerSetter();
                 String methodName = eventBase.methodName();
 
-                Object listener = listenerCache.get(info, eventListenerType);
+                boolean addNewMethod = false;
+                Object listener = listenerCache.get(info, listenerType);
                 DynamicHandler dynamicHandler = null;
                 if (listener != null) {
                     dynamicHandler = (DynamicHandler) Proxy.getInvocationHandler(listener);
-                    if (handler != dynamicHandler.getHandler()) {
-                        dynamicHandler.setHandler(handler);
+                    addNewMethod = handler.equals(dynamicHandler.getHandler());
+                    if (addNewMethod) {
+                        dynamicHandler.addMethod(methodName, method);
                     }
-                    dynamicHandler.addMethod(methodName, method);
-                } else {
+                }
+                if (!addNewMethod) {
                     dynamicHandler = new DynamicHandler(handler);
                     dynamicHandler.addMethod(methodName, method);
                     listener = Proxy.newProxyInstance(
-                            eventListenerType.getClassLoader(),
-                            new Class<?>[]{eventListenerType},
+                            listenerType.getClassLoader(),
+                            new Class<?>[]{listenerType},
                             dynamicHandler);
 
-                    listenerCache.put(info, eventListenerType, listener);
+                    listenerCache.put(info, listenerType, listener);
                 }
 
-                Method setEventListenerMethod = view.getClass().getMethod(eventListenerSetter, eventListenerType);
+                Method setEventListenerMethod = view.getClass().getMethod(listenerSetter, listenerType);
                 setEventListenerMethod.invoke(view, listener);
             }
         } catch (Throwable e) {
@@ -81,31 +84,34 @@ public static void addEventMethod(
     }
 
     public static class DynamicHandler implements InvocationHandler {
-        private Object handler;
+        private WeakReference<Object> handlerRef;
         private final HashMap<String, Method> methodMap = new HashMap<String, Method>(1);
 
         public DynamicHandler(Object handler) {
-            this.handler = handler;
+            this.handlerRef = new WeakReference<Object>(handler);
         }
 
         public void addMethod(String name, Method method) {
             methodMap.put(name, method);
         }
 
         public Object getHandler() {
-            return handler;
+            return handlerRef.get();
         }
 
         public void setHandler(Object handler) {
-            this.handler = handler;
+            this.handlerRef = new WeakReference<Object>(handler);
         }
 
         @Override
         public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
-            String methodName = method.getName();
-            method = methodMap.get(methodName);
-            if (method != null) {
-                return method.invoke(handler, args);
+            Object handler = handlerRef.get();
+            if (handler != null) {
+                String methodName = method.getName();
+                method = methodMap.get(methodName);
+                if (method != null) {
+                    return method.invoke(handler, args);
+                }
             }
             return null;
         }
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/EventBase.java b/library/src/com/lidroid/xutils/view/annotation/event/EventBase.java
@@ -13,9 +13,9 @@
 @Target(ElementType.ANNOTATION_TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface EventBase {
-    Class<?> eventListenerType();
+    Class<?> listenerType();
 
-    String eventListenerSetter();
+    String listenerSetter();
 
     String methodName();
 }
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnChildClick.java b/library/src/com/lidroid/xutils/view/annotation/event/OnChildClick.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = ExpandableListView.OnChildClickListener.class,
-        eventListenerSetter = "setOnChildClickListener",
+        listenerType = ExpandableListView.OnChildClickListener.class,
+        listenerSetter = "setOnChildClickListener",
         methodName = "onChildClick")
 public @interface OnChildClick {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnClick.java b/library/src/com/lidroid/xutils/view/annotation/event/OnClick.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = View.OnClickListener.class,
-        eventListenerSetter = "setOnClickListener",
+        listenerType = View.OnClickListener.class,
+        listenerSetter = "setOnClickListener",
         methodName = "onClick")
 public @interface OnClick {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnCompoundButtonCheckedChange.java b/library/src/com/lidroid/xutils/view/annotation/event/OnCompoundButtonCheckedChange.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = CompoundButton.OnCheckedChangeListener.class,
-        eventListenerSetter = "setOnCheckedChangeListener",
+        listenerType = CompoundButton.OnCheckedChangeListener.class,
+        listenerSetter = "setOnCheckedChangeListener",
         methodName = "onCheckedChanged")
 public @interface OnCompoundButtonCheckedChange {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnFocusChange.java b/library/src/com/lidroid/xutils/view/annotation/event/OnFocusChange.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = View.OnFocusChangeListener.class,
-        eventListenerSetter = "setOnFocusChangeListener",
+        listenerType = View.OnFocusChangeListener.class,
+        listenerSetter = "setOnFocusChangeListener",
         methodName = "onFocusChange")
 public @interface OnFocusChange {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnGroupClick.java b/library/src/com/lidroid/xutils/view/annotation/event/OnGroupClick.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = ExpandableListView.OnGroupClickListener.class,
-        eventListenerSetter = "setOnGroupClickListener",
+        listenerType = ExpandableListView.OnGroupClickListener.class,
+        listenerSetter = "setOnGroupClickListener",
         methodName = "onGroupClick")
 public @interface OnGroupClick {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnGroupCollapse.java b/library/src/com/lidroid/xutils/view/annotation/event/OnGroupCollapse.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = ExpandableListView.OnGroupCollapseListener.class,
-        eventListenerSetter = "setOnGroupCollapseListener",
+        listenerType = ExpandableListView.OnGroupCollapseListener.class,
+        listenerSetter = "setOnGroupCollapseListener",
         methodName = "onGroupCollapse")
 public @interface OnGroupCollapse {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnGroupExpand.java b/library/src/com/lidroid/xutils/view/annotation/event/OnGroupExpand.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = ExpandableListView.OnGroupExpandListener.class,
-        eventListenerSetter = "setOnGroupExpandListener",
+        listenerType = ExpandableListView.OnGroupExpandListener.class,
+        listenerSetter = "setOnGroupExpandListener",
         methodName = "onGroupExpand")
 public @interface OnGroupExpand {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnItemClick.java b/library/src/com/lidroid/xutils/view/annotation/event/OnItemClick.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = AdapterView.OnItemClickListener.class,
-        eventListenerSetter = "setOnItemClickListener",
+        listenerType = AdapterView.OnItemClickListener.class,
+        listenerSetter = "setOnItemClickListener",
         methodName = "onItemClick")
 public @interface OnItemClick {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnItemLongClick.java b/library/src/com/lidroid/xutils/view/annotation/event/OnItemLongClick.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = AdapterView.OnItemLongClickListener.class,
-        eventListenerSetter = "setOnItemLongClickListener",
+        listenerType = AdapterView.OnItemLongClickListener.class,
+        listenerSetter = "setOnItemLongClickListener",
         methodName = "onItemLongClick")
 public @interface OnItemLongClick {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnItemSelected.java b/library/src/com/lidroid/xutils/view/annotation/event/OnItemSelected.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = AdapterView.OnItemSelectedListener.class,
-        eventListenerSetter = "setOnItemSelectedListener",
+        listenerType = AdapterView.OnItemSelectedListener.class,
+        listenerSetter = "setOnItemSelectedListener",
         methodName = "onItemSelected")
 public @interface OnItemSelected {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnKey.java b/library/src/com/lidroid/xutils/view/annotation/event/OnKey.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = View.OnKeyListener.class,
-        eventListenerSetter = "setOnKeyListener",
+        listenerType = View.OnKeyListener.class,
+        listenerSetter = "setOnKeyListener",
         methodName = "onKey")
 public @interface OnKey {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnLongClick.java b/library/src/com/lidroid/xutils/view/annotation/event/OnLongClick.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = View.OnLongClickListener.class,
-        eventListenerSetter = "setOnLongClickListener",
+        listenerType = View.OnLongClickListener.class,
+        listenerSetter = "setOnLongClickListener",
         methodName = "onLongClick")
 public @interface OnLongClick {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnNothingSelected.java b/library/src/com/lidroid/xutils/view/annotation/event/OnNothingSelected.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = AdapterView.OnItemSelectedListener.class,
-        eventListenerSetter = "setOnItemSelectedListener",
+        listenerType = AdapterView.OnItemSelectedListener.class,
+        listenerSetter = "setOnItemSelectedListener",
         methodName = "onNothingSelected")
 public @interface OnNothingSelected {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnPreferenceChange.java b/library/src/com/lidroid/xutils/view/annotation/event/OnPreferenceChange.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = Preference.OnPreferenceChangeListener.class,
-        eventListenerSetter = "setOnPreferenceChangeListener",
+        listenerType = Preference.OnPreferenceChangeListener.class,
+        listenerSetter = "setOnPreferenceChangeListener",
         methodName = "onPreferenceChange")
 public @interface OnPreferenceChange {
     String[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnPreferenceClick.java b/library/src/com/lidroid/xutils/view/annotation/event/OnPreferenceClick.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = Preference.OnPreferenceClickListener.class,
-        eventListenerSetter = "setOnPreferenceClickListener",
+        listenerType = Preference.OnPreferenceClickListener.class,
+        listenerSetter = "setOnPreferenceClickListener",
         methodName = "onPreferenceClick")
 public @interface OnPreferenceClick {
     String[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnProgressChanged.java b/library/src/com/lidroid/xutils/view/annotation/event/OnProgressChanged.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = SeekBar.OnSeekBarChangeListener.class,
-        eventListenerSetter = "setOnSeekBarChangeListener",
+        listenerType = SeekBar.OnSeekBarChangeListener.class,
+        listenerSetter = "setOnSeekBarChangeListener",
         methodName = "onProgressChanged")
 public @interface OnProgressChanged {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnRadioGroupCheckedChange.java b/library/src/com/lidroid/xutils/view/annotation/event/OnRadioGroupCheckedChange.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = RadioGroup.OnCheckedChangeListener.class,
-        eventListenerSetter = "setOnCheckedChangeListener",
+        listenerType = RadioGroup.OnCheckedChangeListener.class,
+        listenerSetter = "setOnCheckedChangeListener",
         methodName = "onCheckedChanged")
 public @interface OnRadioGroupCheckedChange {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnScroll.java b/library/src/com/lidroid/xutils/view/annotation/event/OnScroll.java
@@ -15,8 +15,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = AbsListView.OnScrollListener.class,
-        eventListenerSetter = "setOnScrollListener",
+        listenerType = AbsListView.OnScrollListener.class,
+        listenerSetter = "setOnScrollListener",
         methodName = "onScroll")
 public @interface OnScroll {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnScrollStateChanged.java b/library/src/com/lidroid/xutils/view/annotation/event/OnScrollStateChanged.java
@@ -15,8 +15,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = AbsListView.OnScrollListener.class,
-        eventListenerSetter = "setOnScrollListener",
+        listenerType = AbsListView.OnScrollListener.class,
+        listenerSetter = "setOnScrollListener",
         methodName = "onScrollStateChanged")
 public @interface OnScrollStateChanged {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnStartTrackingTouch.java b/library/src/com/lidroid/xutils/view/annotation/event/OnStartTrackingTouch.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = SeekBar.OnSeekBarChangeListener.class,
-        eventListenerSetter = "setOnSeekBarChangeListener",
+        listenerType = SeekBar.OnSeekBarChangeListener.class,
+        listenerSetter = "setOnSeekBarChangeListener",
         methodName = "onStartTrackingTouch")
 public @interface OnStartTrackingTouch {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnStopTrackingTouch.java b/library/src/com/lidroid/xutils/view/annotation/event/OnStopTrackingTouch.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = SeekBar.OnSeekBarChangeListener.class,
-        eventListenerSetter = "setOnSeekBarChangeListener",
+        listenerType = SeekBar.OnSeekBarChangeListener.class,
+        listenerSetter = "setOnSeekBarChangeListener",
         methodName = "onStopTrackingTouch")
 public @interface OnStopTrackingTouch {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnTabChange.java b/library/src/com/lidroid/xutils/view/annotation/event/OnTabChange.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = TabHost.OnTabChangeListener.class,
-        eventListenerSetter = "setOnTabChangeListener",
+        listenerType = TabHost.OnTabChangeListener.class,
+        listenerSetter = "setOnTabChangeListener",
         methodName = "onTabChange")
 public @interface OnTabChange {
     int[] value();
diff --git a/library/src/com/lidroid/xutils/view/annotation/event/OnTouch.java b/library/src/com/lidroid/xutils/view/annotation/event/OnTouch.java
@@ -30,8 +30,8 @@
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @EventBase(
-        eventListenerType = View.OnTouchListener.class,
-        eventListenerSetter = "setOnTouchListener",
+        listenerType = View.OnTouchListener.class,
+        listenerSetter = "setOnTouchListener",
         methodName = "onTouch")
 public @interface OnTouch {
     int[] value();
