diff --git a/app/libs/processor.jar b/app/libs/processor.jar
index c933b9c..bb4f539 100644
Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index da7d7aa..c565e44 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -207,10 +207,16 @@
             android:name=".ui.activity.ActivationActivity"
             android:launchMode="singleInstance"
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden"/>
+        <activity
+            android:name=".ui.activity.BankActivity"
+            android:launchMode="singleInstance"
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden"/>
 
         <activity
             android:name=".ui.activity.apply.ApplyReplaceCardActivity"
-            android:launchMode="singleInstance" />
+            android:launchMode="singleInstance"
+            android:windowSoftInputMode="adjustPan|stateAlwaysHidden"
+            />
 
         <activity
             android:name=".ui.activity.apply.ApplySigninActivity"
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java
new file mode 100644
index 0000000..5584ef0
--- /dev/null
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/BankActivity.java
@@ -0,0 +1,53 @@
+package com.shunzhi.parent.ui.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.share.mvpsdk.base.activity.BaseCompatActivity;
+import com.shunzhi.parent.R;
+
+/**
+ * Created by lenovo on 2018/4/19.
+ */
+
+public class BankActivity extends BaseCompatActivity {
+
+
+    public static void newInstance(Context context, String info) {
+        Intent intent = new Intent(context, BankActivity.class);
+        intent.putExtra("info", info);
+        context.startActivity(intent);
+    }
+
+
+    TextView tv_info, center_title;
+    ImageView back_top;
+
+    @Override
+    protected void initView(Bundle savedInstanceState) {
+        tv_info = findViewById(R.id.tv_info);
+        center_title = findViewById(R.id.center_title);
+        center_title.setText("");
+        back_top = findViewById(R.id.back_top);
+        back_top.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        String info = getIntent().getStringExtra("info");
+        if (TextUtils.isEmpty(info))
+            tv_info.setText(info);
+
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.activity_bank;
+    }
+}
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
index 2f9b5ad..0ac32d7 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/MyChildActivity.java
@@ -102,10 +102,9 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi
     @Override
     public void updateChildList(CurrentBean currentBean) {
         currlist.clear();
-        DBControl.childInfoDao.deleteAll();
         List<ChildBean> list = currentBean.getStudentClass();
         for(int i=0;i<list.size();i++){
-            DBControl.childInfoDao.onCreate(list.get(i));
+            DBControl.childInfoDao.createOrUpdate(list.get(i));
         }
 
         currlist.addAll(list);
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplyReplaceCardActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplyReplaceCardActivity.java
index 82d1740..21160ad 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplyReplaceCardActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplyReplaceCardActivity.java
@@ -23,15 +23,17 @@ import com.shunzhi.parent.ui.fragment.apply.ApplySigninFragment;
  * 补卡界面
  */
 
-public class ApplyReplaceCardActivity extends BaseMVPCompatActivity implements View.OnClickListener{
+public class ApplyReplaceCardActivity extends BaseMVPCompatActivity implements View.OnClickListener {
     ApplyReplaceCardFragment applyReplaceCardFragment = null;
     ImageView ivBack;
     TextView center_title;
     FrameLayout frame_replacecard;
-    FragmentTransaction fragmentTransaction=null;
+    FragmentTransaction fragmentTransaction = null;
+    String childJson;
 
-    public static void getInstance(Context context) {
+    public static void getInstance(Context context, String jsonStr) {
         Intent intent = new Intent(context, ApplyReplaceCardActivity.class);
+        intent.putExtra("jsonStr", jsonStr);
         context.startActivity(intent);
     }
 
@@ -47,19 +49,25 @@ public class ApplyReplaceCardActivity extends BaseMVPCompatActivity implements V
         frame_replacecard = findViewById(R.id.frame_replacecard);
         center_title.setText("补卡");
         ivBack.setOnClickListener(this);
+        childJson = getIntent().getStringExtra("jsonStr");
+        Bundle bundle = new Bundle();
+        bundle.putString("childJson", childJson);
+        applyReplaceCardFragment.setArguments(bundle);
 
         fragmentTransaction = getSupportFragmentManager().beginTransaction();
-        fragmentTransaction.add(R.id.frame_replacecard,applyReplaceCardFragment).show(applyReplaceCardFragment).commit();
+        fragmentTransaction.add(R.id.frame_replacecard, applyReplaceCardFragment).show(applyReplaceCardFragment).commit();
     }
 
     @Override
     protected int getLayoutId() {
         return R.layout.activity_apply_replacecard;
     }
+
     @Override
     public void onClick(View view) {
         finish();
     }
+
     @NonNull
     @Override
     public BasePresenter initPresenter() {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplySigninActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplySigninActivity.java
index 4a4ea37..f2a01b1 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplySigninActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/apply/ApplySigninActivity.java
@@ -35,16 +35,17 @@ import java.util.List;
 
 public class ApplySigninActivity extends BaseMVPCompatActivity implements View.OnClickListener{
 
-    public static void getInstance(Context context,ChildBean childBean) {
+    public static void getInstance(Context context,String jsonStr) {
         Intent intent = new Intent(context, ApplySigninActivity.class);
+        intent.putExtra("childStr",jsonStr);
         context.startActivity(intent);
     }
-    List<ChildBean> childBeanList = new ArrayList<>();
     FragmentTransaction fragmentTransaction = null;
     ApplySigninFragment applySigninFragment = null;
     ImageView ivBack;
     FrameLayout frame_signin;
     TextView center_title;
+    String childStr;
 
     @Override
     protected void initView(Bundle savedInstanceState) {
@@ -60,8 +61,12 @@ public class ApplySigninActivity extends BaseMVPCompatActivity implements View.O
         center_title.setText("考勤");
 
         ivBack.setOnClickListener(this);
-//        Bundle bundle = new Bundle();
+        childStr=getIntent().getStringExtra("childStr");
+
+        Bundle bundle = new Bundle();
+        bundle.putString("childStr",childStr);
 //        bundle.putString("studentId",childBeanList.listIterator("studentId"));
+        applySigninFragment.setArguments(bundle);
         fragmentTransaction = getSupportFragmentManager().beginTransaction();
         fragmentTransaction.add(R.id.frame_signin,applySigninFragment).show(applySigninFragment).commit();
 
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 1b2f25e..efea4c2 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
@@ -16,9 +16,11 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.google.gson.Gson;
 import com.share.mvpsdk.base.fragment.BaseCompatFragment;
+import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
@@ -61,8 +63,7 @@ public class ReportFragment extends BaseCompatFragment implements View.OnClickLi
         tvNoData = view.findViewById(R.id.tvNoData);
         tabLayout = view.findViewById(R.id.tabLayout);
         tvName.setOnClickListener(this);
-        registerForContextMenu(tvName);
-
+        tvName.setEllipsize(TextUtils.TruncateAt.END);
         tvShaiXuan.setOnClickListener(this);
 
         myFragmentAdapter = new MyFragmentAdapter(getChildFragmentManager());
@@ -71,8 +72,10 @@ public class ReportFragment extends BaseCompatFragment implements View.OnClickLi
         createSchoolMenu();
         String currChildStr = AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.CURRCHILDJSONSTR);
         if (TextUtils.isEmpty(currChildStr)) {
-            tvName.setText(childlist.get(0).getStudentName());
-            jsonStr = g.toJson(childlist.get(0), ChildBean.class);
+            if (childlist != null && childlist.size() > 0) {
+                tvName.setText(childlist.get(0).getStudentName());
+                jsonStr = g.toJson(childlist.get(0), ChildBean.class);
+            }
         } else {
             ChildBean childBean = g.fromJson(currChildStr, ChildBean.class);
             tvName.setText(childBean.getStudentName());
@@ -117,26 +120,28 @@ public class ReportFragment extends BaseCompatFragment implements View.OnClickLi
     }
 
     private void showChildName() {
-        schoolMenu.show();
+        childMenu.show();
     }
 
-    private PopupMenu schoolMenu = null;
+    private PopupMenu childMenu = null;
 
     private void createSchoolMenu() {
-        if (schoolMenu != null) return;
-        schoolMenu = new PopupMenu(getActivity(), tvName);
-        Menu menu = schoolMenu.getMenu();
-        for (int i = 0; i < childlist.size(); i++) {
-            final int finalI = i;
-            menu.add(0, i, 10, childlist.get(i).getStudentName()).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
-                @Override
-                public boolean onMenuItemClick(MenuItem item) {
-                    tvName.setText(item.getTitle());
-                    jsonStr = g.toJson(childlist.get(finalI), ChildBean.class);
-                    AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr);
-                    return false;
-                }
-            });
+        if (childMenu != null) return;
+        childMenu = new PopupMenu(getActivity(), tvName);
+        Menu menu = childMenu.getMenu();
+        if (childlist != null && childlist.size() > 0) {
+            for (int i = 0; i < childlist.size(); i++) {
+                final int finalI = i;
+                menu.add(0, i, 10, childlist.get(i).getStudentName()).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+                    @Override
+                    public boolean onMenuItemClick(MenuItem item) {
+                        tvName.setText(item.getTitle());
+                        jsonStr = g.toJson(childlist.get(finalI), ChildBean.class);
+                        AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr);
+                        return false;
+                    }
+                });
+            }
         }
     }
 
@@ -164,7 +169,7 @@ public class ReportFragment extends BaseCompatFragment implements View.OnClickLi
         @Override
         public Fragment getItem(int position) {
             if (position == 0) {
-                chengZhangFragment1 = ChengZhangFragment.newInstance(ChengZhangFragment.TYPE_CHENGZHANG);
+                chengZhangFragment1 = ChengZhangFragment.newInstance(ChengZhangFragment.TYPE_CHENGZHANG, jsonStr);
                 return chengZhangFragment1;
             } else if (position == 1) {
                 chengZhangFragment2 = ChengZhangFragment.newInstance(ChengZhangFragment.TYPE_REPORT);
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
index ba487c4..07a735f 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java
@@ -11,10 +11,12 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.google.gson.Gson;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.R;
+import com.shunzhi.parent.bean.ChildBean;
 import com.shunzhi.parent.contract.apply.ApplyReplaceCardContract;
 import com.shunzhi.parent.presenter.apply.ApplyReplaceCardPresenter;
 import com.shunzhi.parent.views.ReplaceCardDialog;
@@ -30,6 +32,7 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace
     ReplaceCardDialog replaceCardDialog = null;
     private EditText et_cardnum;
     private String cardnum = "";
+    private ChildBean currChildBean = new ChildBean();
 
     @NonNull
     @Override
@@ -48,8 +51,14 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace
         bt_sure = view.findViewById(R.id.bt_sure);
         bt_cancel = view.findViewById(R.id.bt_cancle);
         et_cardnum = view.findViewById(R.id.et_cardnum);
-
         bt_sure.setOnClickListener(this);
+        Gson g = new Gson();
+        String jsonStr = getArguments().getString("childJson");
+        if (!TextUtils.isEmpty(jsonStr)) {
+            currChildBean = g.fromJson(jsonStr, ChildBean.class);
+            et_cardnum.setText(currChildBean.getCardNumber());
+        }
+
 
     }
 
@@ -65,7 +74,7 @@ public class ApplyReplaceCardFragment extends BaseMVPCompatFragment<ApplyReplace
                     ToastUtils.showToast("卡号不能为空，请重新输入!");
                 } else {
                     //studentid 从成长界面获取 此处设置为“123”
-                    mPresenter.ReplaceCardDetail(12, cardnum);
+                    mPresenter.ReplaceCardDetail(currChildBean.getStudentId(), cardnum);
                 }
                 break;
             default:
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java
index 82e16b5..629a27a 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java
@@ -20,14 +20,17 @@ import android.widget.Toast;
 
 import com.bigkoo.pickerview.builder.TimePickerBuilder;
 import com.bigkoo.pickerview.listener.CustomListener;
+import com.bigkoo.pickerview.listener.OnTimeSelectChangeListener;
 import com.bigkoo.pickerview.listener.OnTimeSelectListener;
 import com.bigkoo.pickerview.view.TimePickerView;
+import com.google.gson.Gson;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
 import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.adapter.AttendanceAdapter;
+import com.shunzhi.parent.bean.ChildBean;
 import com.shunzhi.parent.bean.ToolBean;
 import com.shunzhi.parent.bean.apply.AttendanceBean;
 import com.shunzhi.parent.contract.apply.ApplySigninContract;
@@ -44,16 +47,17 @@ import java.util.List;
  * Created by Administrator on 2018/4/10 0010.
  */
 
-public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContract.ApplySigninPresenter, ApplySigninContract.IApplySigninModel> implements View.OnClickListener, ApplySigninContract.IApplySigninView{
+public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContract.ApplySigninPresenter, ApplySigninContract.IApplySigninModel> implements View.OnClickListener, ApplySigninContract.IApplySigninView {
     private RecyclerView recycle_attendance;
     private AttendanceAdapter attendanceAdapter;
-    List<AttendanceBean> list=new ArrayList<>();
-    private TextView tv_tips,tv_kaoqin_num,tv_kaoqin_user,tv_kaoqin_date;
+    List<AttendanceBean> list = new ArrayList<>();
+    private TextView tv_tips, tv_kaoqin_num, tv_kaoqin_user, tv_kaoqin_date;
     private LinearLayout layout_tv;
     private ImageView iv_calendar;
     private TimePickerView pvCustomLunar;
-    private String date="";
+    private String currdate = "";
     List<AttendanceBean> signinlist = new ArrayList<>();
+    private ChildBean currChildBean = new ChildBean();
 
 
     public BasePresenter initPresenter() {
@@ -73,27 +77,35 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra
         tv_kaoqin_date = view.findViewById(R.id.tv_kaoqin_date);
         tv_kaoqin_num = view.findViewById(R.id.tv_kaoqin_num);
         iv_calendar = view.findViewById(R.id.iv_calendar);
+        Gson g = new Gson();
+        String jsonStr = getArguments().getString("childStr");
+        if (!TextUtils.isEmpty(jsonStr))
+            currChildBean = g.fromJson(jsonStr, ChildBean.class);
 
         initLunarPicker();
-        iv_calendar .setOnClickListener(this);
+        iv_calendar.setOnClickListener(this);
 
-        date = "2017-07-19";//date = getNowTime();
+        currdate = getNowTime();
         tv_kaoqin_date.setText(getNowTime());
         recycle_attendance = view.findViewById(R.id.recycle_attendance);
 
         recycle_attendance.setLayoutManager(new LinearLayoutManager(getActivity()));
         attendanceAdapter = new AttendanceAdapter(getActivity());
         recycle_attendance.setAdapter(attendanceAdapter);
+        getData();
 
-        mPresenter.SigninDetail(185,1,date);
+    }
 
+    private void getData() {
+        mPresenter.SigninDetail(currChildBean.getStudentId(), currChildBean.getSchoolId(), currdate);
     }
 
     /**
      * 获取当前时间
+     *
      * @return
      */
-    public static String getNowTime(){
+    public static String getNowTime() {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date date = new Date(System.currentTimeMillis());
         return simpleDateFormat.format(date);
@@ -102,7 +114,7 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra
     @RequiresApi(api = Build.VERSION_CODES.N)
     @Override
     public void onClick(View v) {
-        switch (v.getId()){
+        switch (v.getId()) {
             case R.id.iv_calendar:
                 pvCustomLunar.show();
                 break;
@@ -121,32 +133,42 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra
             @Override
             public void onTimeSelect(Date date, View v) {
                 ToastUtils.showToast(getTime(date));
-                Log.i("getTime:",getTime(date));
-                tv_kaoqin_date.setText(getTime(date));
+                Log.i("getTime:", getTime(date));
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                tv_kaoqin_date.setText(simpleDateFormat.format(date));
+                currdate = simpleDateFormat.format(date);
+                getData();
+
+            }
+        }).setTimeSelectChangeListener(new OnTimeSelectChangeListener() {
+            @Override
+            public void onTimeSelectChanged(Date date) {
+                Log.i("pvTime", date.toString());
             }
-        })
-                .setDate(selectedDate)
-                .setRangDate(startDate, endDate)
-                .setLayoutRes(R.layout.pickerview_custom_lunar, new CustomListener() {
-                    @Override
-                    public void customLayout(View v) {
-                        final TextView tvSubmit = (TextView) v.findViewById(R.id.tv_finish);
-                        ImageView ivCancel = (ImageView) v.findViewById(R.id.iv_cancel);
-                        tvSubmit.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                pvCustomLunar.returnData();
-                                pvCustomLunar.dismiss();
-                            }
-                        });
-                        ivCancel.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                pvCustomLunar.dismiss();
-                            }
-                        });
-                    }
-                }).build();
+        }).build();
+//                .setDate(selectedDate)
+//                .setRangDate(startDate, endDate)
+//                .setLayoutRes(R.layout.pickerview_custom_lunar, new CustomListener() {
+//                    @Override
+//                    public void customLayout(View v) {
+//                        final TextView tvSubmit = (TextView) v.findViewById(R.id.tv_finish);
+//                        ImageView ivCancel = (ImageView) v.findViewById(R.id.iv_cancel);
+//                        tvSubmit.setOnClickListener(new View.OnClickListener() {
+//                            @Override
+//                            public void onClick(View v) {
+//                                pvCustomLunar.dismiss();
+//                                pvCustomLunar.returnData();
+//                                initData();
+//                            }
+//                        });
+//                        ivCancel.setOnClickListener(new View.OnClickListener() {
+//                            @Override
+//                            public void onClick(View v) {
+//                                pvCustomLunar.dismiss();
+//                            }
+//                        });
+//                    }
+//                }).build();
     }
 
 
@@ -159,9 +181,9 @@ public class ApplySigninFragment extends BaseMVPCompatFragment<ApplySigninContra
     @Override
     public void showDetialList(List<AttendanceBean> list) {
 
-        if (list.size() == 0){
+        if (list.size() == 0) {
             layout_tv.setVisibility(View.VISIBLE);
-        }else {
+        } else {
             recycle_attendance.setVisibility(View.VISIBLE);
             signinlist.clear();
             signinlist.addAll(list);
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 78491d1..d252313 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
@@ -7,24 +7,38 @@ import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.TextView;
 
 import com.amy.monthweek.materialcalendarview.MonthWeekMaterialCalendarView;
+import com.google.gson.Gson;
 import com.prolificinteractive.materialcalendarview.CalendarDay;
 import com.prolificinteractive.materialcalendarview.MaterialCalendarView;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.fragment.BaseMVPCompatFragment;
+import com.share.mvpsdk.utils.ToastUtils;
+import com.shunzhi.parent.AppConfig;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.adapter.ReportAdapter;
+import com.shunzhi.parent.bean.ChildBean;
 import com.shunzhi.parent.bean.ReportBean;
 import com.shunzhi.parent.contract.report.ReportContract;
 import com.shunzhi.parent.presenter.report.ReportPresenter;
+import com.shunzhi.parent.ui.activity.BankActivity;
+import com.shunzhi.parent.ui.activity.MyChildActivity;
 import com.shunzhi.parent.ui.activity.apply.ApplyReplaceCardActivity;
 import com.shunzhi.parent.ui.activity.apply.ApplySigninActivity;
-import com.shunzhi.parent.ui.activity.report.ReportDetialActivity;
-import com.shunzhi.parent.ui.activity.report.ReportSceneActivity;
-import com.shunzhi.parent.ui.fragment.apply.ApplyReplaceCardFragment;
+import com.shunzhi.parent.ui.activity.binding.CheckInfoActivity;
+import com.shunzhi.parent.ui.activity.mywebview.WebViewActivity;
+
 
 import java.util.List;
 
@@ -35,6 +49,8 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
 
     public static String TYPE_CHENGZHANG = "chengzhang", TYPE_REPORT = "report";
 
+    public ChildBean childBean = new ChildBean();
+
     public static ChengZhangFragment newInstance(String type) {
         Bundle bundle = new Bundle();
         bundle.putString("type", type);
@@ -43,6 +59,15 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
         return chengZhangFragment;
     }
 
+    public static ChengZhangFragment newInstance(String type, String jsonStr) {
+        Bundle bundle = new Bundle();
+        bundle.putString("type", type);
+        bundle.putString("jsonStr", jsonStr);
+        ChengZhangFragment chengZhangFragment = new ChengZhangFragment();
+        chengZhangFragment.setArguments(bundle);
+        return chengZhangFragment;
+    }
+
     RecyclerView recyclerView;
 
     ReportAdapter reportAdapter;
@@ -53,7 +78,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
 
     MaterialCalendarView calendarView_month_mode;
 
-    private String type = "";
+    private String type = "", jsonStr = "";
 
     LinearLayout layout_chengzhang, layout_report, layout_kaoqin, layout_buka, layout_qingjia;
 
@@ -79,9 +104,14 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
         layout_qingjia.setOnClickListener(this);
 
         type = getArguments().getString("type");
+        jsonStr = getArguments().getString("jsonStr");
+        Gson g = new Gson();
+
+
         if (type.equals(TYPE_CHENGZHANG)) {
             layout_chengzhang.setVisibility(View.VISIBLE);
             layout_report.setVisibility(View.GONE);
+            childBean = g.fromJson(jsonStr, ChildBean.class);
 
         } else {
             layout_chengzhang.setVisibility(View.GONE);
@@ -148,14 +178,61 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
 
     @Override
     public void onClick(View view) {
+        if (childBean.getCount() == 0) {
+            final PopupWindow popupWindow = new PopupWindow();
+            popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+            popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+            backgroundAlpha(0.5f);
+            View view1 = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_view, null);
+            TextView dialog_info = view1.findViewById(R.id.dialog_info);
+            dialog_info.setText("请前往订购中心\n订购“智能校卫”\n才能够使用相关应用功能");
+            dialog_info.setGravity(Gravity.CENTER);
+            TextView right_btn = view1.findViewById(R.id.right_btn);
+            right_btn.setText("前往订购");
+            right_btn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    popupWindow.dismiss();
+                    backgroundAlpha(1f);
+                    Bundle bundle = new Bundle();
+                    bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
+                            AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
+                    bundle.putInt("type", AppConfig.ORDER_CENTER);
+                    startNewActivity(WebViewActivity.class, bundle);
+
+                }
+            });
+            TextView cancel_btn = view1.findViewById(R.id.cancel_btn);
+            cancel_btn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    popupWindow.dismiss();
+                    backgroundAlpha(1f);
+                }
+            });
+
+            popupWindow.setContentView(view1);
+            popupWindow.showAtLocation(recyclerView, Gravity.CENTER, 0, 0);
+            return;
+        }
+
+        if (TextUtils.isEmpty(childBean.getCardNumber())) {
+
+            BankActivity.newInstance(getActivity(), "如果使用该应用，请前往激活孩子校园卡");
+
+        }
+
         switch (view.getId()) {
+
             case R.id.layout_kaoqin:
-                //ApplySigninActivity.getInstance(getActivity());
+
+                ApplySigninActivity.getInstance(getActivity(), jsonStr);
                 break;
             case R.id.layout_buka:
-                //ApplyReplaceCardActivity.getInstance(getActivity());
+                ApplyReplaceCardActivity.getInstance(getActivity(), jsonStr);
                 break;
             case R.id.layout_qingjia:
+                ToastUtils.showToast("正在努力开发中，敬请期待");
                 break;
         }
     }
@@ -172,4 +249,10 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
         this.handler = handler;
         mPresenter.getReports();
     }
+
+    public void backgroundAlpha(float bgAlpha) {
+        WindowManager.LayoutParams lp = getActivity().getWindow().getAttributes();
+        lp.alpha = bgAlpha; //0.0-1.0
+        getActivity().getWindow().setAttributes(lp);
+    }
 }
diff --git a/app/src/main/res/layout/activity_bank.xml b/app/src/main/res/layout/activity_bank.xml
new file mode 100644
index 0000000..e2de138
--- /dev/null
+++ b/app/src/main/res/layout/activity_bank.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/white"
+    android:orientation="vertical"
+    tools:context="com.shunzhi.parent.ui.activity.BankActivity">
+
+    <include layout="@layout/top" />
+
+    <TextView
+        android:id="@+id/tv_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="" />
+
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_apply_replacecard.xml b/app/src/main/res/layout/fragment_apply_replacecard.xml
index 23eefd6..a973bd2 100644
--- a/app/src/main/res/layout/fragment_apply_replacecard.xml
+++ b/app/src/main/res/layout/fragment_apply_replacecard.xml
@@ -86,8 +86,7 @@
                 android:layout_margin="@dimen/dp_8"
                 android:gravity="center"
                 android:background="@null"
-                android:inputType="number"
-                android:text="1317410119"
+                android:text=""
                 android:textColor="@color/hintTextColor"
                 android:textSize="@dimen/textSize16" />
 
diff --git a/app/src/main/res/layout/fragment_report.xml b/app/src/main/res/layout/fragment_report.xml
index f2d2e19..6daa8a7 100644
--- a/app/src/main/res/layout/fragment_report.xml
+++ b/app/src/main/res/layout/fragment_report.xml
@@ -22,8 +22,9 @@
             android:layout_gravity="center_vertical"
             android:drawablePadding="10dp"
             android:drawableRight="@drawable/pull"
-            android:text=""
-            android:textColor="@color/textColor"
+            android:maxEms="6"
+            android:maxLines="1"
+            android:textColor="@color/white"
             android:textSize="@dimen/textSize16" />
 
         <TextView
diff --git a/gradle.properties b/gradle.properties
index aac7c9b..766b2f9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx512m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
--
libgit2 0.21.0