Merge branch 'developer' into yxb_dev

姚旭斌
2 parents 794b3d69 6edf5ac2
Showing 1 changed file with 1 additions and 3 deletions Show diff stats
app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
@@ -195,9 +195,7 @@ public class ReportFragment extends BaseMVPCompatFragment&lt;MyChildContract.MyChil
                 }
                 tvName.setText(childBean.getStudentName());
             }
-            if(chengZhangFragment1!=null) {
-                chengZhangFragment1.setChildJson(jsonStr);
-            }
+            if (null!=chengZhangFragment1)chengZhangFragment1.setChildJson(jsonStr);
             AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr);
             createSchoolMenu();
         }
...	...	@@ -195,9 +195,7 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
195	195	}
196	196	tvName.setText(childBean.getStudentName());
197	197	}
198		- if(chengZhangFragment1!=null) {
199		- chengZhangFragment1.setChildJson(jsonStr);
200		- }
	198	+ if (null!=chengZhangFragment1)chengZhangFragment1.setChildJson(jsonStr);
201	199	AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr);
202	200	createSchoolMenu();
203	201	}
...	...