Merge branch 'developer' into yxb_dev

# Conflicts: # app/libs/processor.jar

Merge branch 'developer' into yxb_dev
# Conflicts: # app/libs/processor.jar
姚旭斌
2 parents d246c3a5 6cc68c13
Showing 4 changed files with 11 additions and 1 deletions Show diff stats
app/libs/processor.jar
app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
app/src/main/res/layout/layout_consult_content.xml
@@ -195,6 +195,7 @@ public class ReportFragment extends BaseMVPCompatFragment&lt;MyChildContract.MyChil
                 }
                 tvName.setText(childBean.getStudentName());
             }
+            chengZhangFragment1.setChildJson(jsonStr);
             AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr);
             createSchoolMenu();
         }
@@ -99,6 +99,10 @@ public class ChengZhangFragment extends BaseMVPCompatFragment&lt;ReportContract.Rep
         layout_qingjia.setOnClickListener(this);
         type = getArguments().getString("type");
         jsonStr = getArguments().getString("jsonStr");
+        show();
+    }
+
+    private void show(){
         Gson g = new Gson();
         if (type.equals(TYPE_CHENGZHANG)) {
             layout_chengzhang.setVisibility(View.VISIBLE);
@@ -247,4 +251,9 @@ public class ChengZhangFragment extends BaseMVPCompatFragment&lt;ReportContract.Rep
         lp.alpha = bgAlpha; //0.0-1.0
         getActivity().getWindow().setAttributes(lp);
     }
+
+    public void setChildJson(String jsonStr) {
+        this.jsonStr=jsonStr;
+        show();
+    }
 }
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/size_dp_100"
-    android:layout_marginBottom="@dimen/size_dp_10"
+    android:layout_marginTop="@dimen/size_dp_10"
     android:orientation="vertical">
  
     <LinearLayout
...	...	@@ -195,6 +195,7 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
195	195	}
196	196	tvName.setText(childBean.getStudentName());
197	197	}
	198	+ chengZhangFragment1.setChildJson(jsonStr);
198	199	AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr);
199	200	createSchoolMenu();
200	201	}
...	...
...	...	@@ -99,6 +99,10 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
99	99	layout_qingjia.setOnClickListener(this);
100	100	type = getArguments().getString("type");
101	101	jsonStr = getArguments().getString("jsonStr");
	102	+ show();
	103	+ }
	104	+
	105	+ private void show(){
102	106	Gson g = new Gson();
103	107	if (type.equals(TYPE_CHENGZHANG)) {
104	108	layout_chengzhang.setVisibility(View.VISIBLE);
...	...	@@ -247,4 +251,9 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
247	251	lp.alpha = bgAlpha; //0.0-1.0
248	252	getActivity().getWindow().setAttributes(lp);
249	253	}
	254	+
	255	+ public void setChildJson(String jsonStr) {
	256	+ this.jsonStr=jsonStr;
	257	+ show();
	258	+ }
250	259	}
...	...
...	...	@@ -2,7 +2,7 @@
2	2	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3	3	android:layout_width="match_parent"
4	4	android:layout_height="@dimen/size_dp_100"
5		- android:layout_marginBottom="@dimen/size_dp_10"
	5	+ android:layout_marginTop="@dimen/size_dp_10"
6	6	android:orientation="vertical">
7	7
8	8	<LinearLayout
...	...