Merge pull request yangfuhai#43 from lsjwzh/master

完善ViewInject,使得在同一页面可以组合注入inflate进来的view(不支持Fragment)

Author: yangfuhai

src/net/tsz/afinal/FinalActivity.java

@@ -93,7 +93,12 @@ public static void initInjectedView(Object injectedSource,View sourceView){
 					int viewId = viewInject.id();
 					try {
 						field.setAccessible(true);
-						field.set(injectedSource,sourceView.findViewById(viewId));
+                        /*当已经被赋值时，不在重复赋值，用于include，inflate情景下的viewinject组合*/
+                        if(field.get(injectedSource)==null){
+						    field.set(injectedSource,sourceView.findViewById(viewId));
+                        }else{
+                            continue;
+                        }
 					} catch (Exception e) {
 						e.printStackTrace();
 					}
@@ -109,7 +114,8 @@ public static void initInjectedView(Object injectedSource,View sourceView){
 					String itemClickMethod = viewInject.itemClick();
 					if(!TextUtils.isEmpty(itemClickMethod))
 						setItemClickListener(injectedSource,field,itemClickMethod);
-					
+
+
 					String itemLongClickMethod = viewInject.itemLongClick();
 					if(!TextUtils.isEmpty(itemLongClickMethod))
 						setItemLongClickListener(injectedSource,field,itemLongClickMethod);

src/net/tsz/afinal/FinalDb.java

@@ -518,7 +518,7 @@ public <T> T loadOneToMany(T entity ,Class<T> clazz,Class<?> ... findClass){
                     }
 
                     if(isFind){
-                        List<?> list = findAllByWhere(one.getOneClass(), one.getColumn()+"="+id);
+                        List<?> list = findAllByWhere(one.getOneClass(), one.getColumn()+"='"+id+"'");
                         if(list!=null){
                             /*如果是OneToManyLazyLoader泛型，则执行灌入懒加载数据*/
                             if(one.getDataType()==OneToManyLazyLoader.class){