Commit 6cc68c130758a2c8ee1e37276218f4dee29390d9
1 parent
45b64f1c
Exists in
yxb_dev
and in
1 other branch
no message
Showing
4 changed files
with
11 additions
and
1 deletions
Show diff stats
app/libs/processor.jar
No preview for this file type
app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
... | ... | @@ -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 | } |
... | ... |
app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
... | ... | @@ -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); |
... | ... | @@ -251,4 +255,9 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep |
251 | 255 | lp.alpha = bgAlpha; //0.0-1.0 |
252 | 256 | getActivity().getWindow().setAttributes(lp); |
253 | 257 | } |
258 | + | |
259 | + public void setChildJson(String jsonStr) { | |
260 | + this.jsonStr=jsonStr; | |
261 | + show(); | |
262 | + } | |
254 | 263 | } |
... | ... |
app/src/main/res/layout/layout_consult_content.xml
... | ... | @@ -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 |
... | ... |