Skip to content

Commit fdb6401

Browse files
committed
Merge pull request yangfuhai#43 from lsjwzh/master
完善ViewInject,使得在同一页面可以组合注入inflate进来的view(不支持Fragment)
2 parents d11d9ab + 33f46db commit fdb6401

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/net/tsz/afinal/FinalActivity.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,12 @@ public static void initInjectedView(Object injectedSource,View sourceView){
9393
int viewId = viewInject.id();
9494
try {
9595
field.setAccessible(true);
96-
field.set(injectedSource,sourceView.findViewById(viewId));
96+
/*当已经被赋值时,不在重复赋值,用于include,inflate情景下的viewinject组合*/
97+
if(field.get(injectedSource)==null){
98+
field.set(injectedSource,sourceView.findViewById(viewId));
99+
}else{
100+
continue;
101+
}
97102
} catch (Exception e) {
98103
e.printStackTrace();
99104
}
@@ -109,7 +114,8 @@ public static void initInjectedView(Object injectedSource,View sourceView){
109114
String itemClickMethod = viewInject.itemClick();
110115
if(!TextUtils.isEmpty(itemClickMethod))
111116
setItemClickListener(injectedSource,field,itemClickMethod);
112-
117+
118+
113119
String itemLongClickMethod = viewInject.itemLongClick();
114120
if(!TextUtils.isEmpty(itemLongClickMethod))
115121
setItemLongClickListener(injectedSource,field,itemLongClickMethod);

src/net/tsz/afinal/FinalDb.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ public <T> T loadOneToMany(T entity ,Class<T> clazz,Class<?> ... findClass){
518518
}
519519

520520
if(isFind){
521-
List<?> list = findAllByWhere(one.getOneClass(), one.getColumn()+"="+id);
521+
List<?> list = findAllByWhere(one.getOneClass(), one.getColumn()+"='"+id+"'");
522522
if(list!=null){
523523
/*如果是OneToManyLazyLoader泛型,则执行灌入懒加载数据*/
524524
if(one.getDataType()==OneToManyLazyLoader.class){

0 commit comments

Comments
 (0)