Commit 65f35ef4dff7b2d412ad6f37dda258f3ca598ed1
Exists in
yxb_dev
and in
1 other branch
Merge branch 'developer' into yxb_dev
# Conflicts: # app/libs/processor.jar
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,6 +195,7 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil | ||
| 195 | } | 195 | } |
| 196 | tvName.setText(childBean.getStudentName()); | 196 | tvName.setText(childBean.getStudentName()); |
| 197 | } | 197 | } |
| 198 | + chengZhangFragment1.setChildJson(jsonStr); | ||
| 198 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr); | 199 | AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr); |
| 199 | createSchoolMenu(); | 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,6 +99,10 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep | ||
| 99 | layout_qingjia.setOnClickListener(this); | 99 | layout_qingjia.setOnClickListener(this); |
| 100 | type = getArguments().getString("type"); | 100 | type = getArguments().getString("type"); |
| 101 | jsonStr = getArguments().getString("jsonStr"); | 101 | jsonStr = getArguments().getString("jsonStr"); |
| 102 | + show(); | ||
| 103 | + } | ||
| 104 | + | ||
| 105 | + private void show(){ | ||
| 102 | Gson g = new Gson(); | 106 | Gson g = new Gson(); |
| 103 | if (type.equals(TYPE_CHENGZHANG)) { | 107 | if (type.equals(TYPE_CHENGZHANG)) { |
| 104 | layout_chengzhang.setVisibility(View.VISIBLE); | 108 | layout_chengzhang.setVisibility(View.VISIBLE); |
| @@ -247,4 +251,9 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep | @@ -247,4 +251,9 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep | ||
| 247 | lp.alpha = bgAlpha; //0.0-1.0 | 251 | lp.alpha = bgAlpha; //0.0-1.0 |
| 248 | getActivity().getWindow().setAttributes(lp); | 252 | getActivity().getWindow().setAttributes(lp); |
| 249 | } | 253 | } |
| 254 | + | ||
| 255 | + public void setChildJson(String jsonStr) { | ||
| 256 | + this.jsonStr=jsonStr; | ||
| 257 | + show(); | ||
| 258 | + } | ||
| 250 | } | 259 | } |
app/src/main/res/layout/layout_consult_content.xml
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | android:layout_width="match_parent" | 3 | android:layout_width="match_parent" |
| 4 | android:layout_height="@dimen/size_dp_100" | 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 | android:orientation="vertical"> | 6 | android:orientation="vertical"> |
| 7 | 7 | ||
| 8 | <LinearLayout | 8 | <LinearLayout |