From 6cc68c130758a2c8ee1e37276218f4dee29390d9 Mon Sep 17 00:00:00 2001
From: 陶汉栋 <2821744554@qq.com>
Date: Fri, 20 Apr 2018 13:40:39 +0800
Subject: [PATCH] no message

---
 app/libs/processor.jar                                                          | Bin 5681 -> 0 bytes
 app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java            |  1 +
 app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java |  9 +++++++++
 app/src/main/res/layout/layout_consult_content.xml                              |  2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/libs/processor.jar b/app/libs/processor.jar
index 46b1996..adae491 100644
Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
index 3215b43..6598594 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
@@ -195,6 +195,7 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
                 }
                 tvName.setText(childBean.getStudentName());
             }
+            chengZhangFragment1.setChildJson(jsonStr);
             AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr);
             createSchoolMenu();
         }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
index 3ee0fe4..d12da75 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
@@ -99,6 +99,10 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<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);
@@ -251,4 +255,9 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
         lp.alpha = bgAlpha; //0.0-1.0
         getActivity().getWindow().setAttributes(lp);
     }
+
+    public void setChildJson(String jsonStr) {
+        this.jsonStr=jsonStr;
+        show();
+    }
 }
diff --git a/app/src/main/res/layout/layout_consult_content.xml b/app/src/main/res/layout/layout_consult_content.xml
index d7b62e3..b04708c 100644
--- a/app/src/main/res/layout/layout_consult_content.xml
+++ b/app/src/main/res/layout/layout_consult_content.xml
@@ -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
--
libgit2 0.21.0