diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java
index c0ca9e0..967aab6 100644
--- a/app/src/main/java/com/shunzhi/parent/AppConfig.java
+++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java
@@ -25,6 +25,7 @@ public class AppConfig {
     public static String NIM_CONFIG_VIBRATE = "nim_config_vibrate";//收到通知震动
     public static String NIM_CONFIG_SOUND = "nim_config_sound";//收到通知响铃
     public static String ISBINDING="isbinding";
+    public static String CURRCHILDJSONSTR="";
 
 
     public static boolean ISLOGIN = false;
diff --git a/app/src/main/java/com/shunzhi/parent/db/ChildInfoDao.java b/app/src/main/java/com/shunzhi/parent/db/ChildInfoDao.java
index 3e79c15..01b8fb8 100644
--- a/app/src/main/java/com/shunzhi/parent/db/ChildInfoDao.java
+++ b/app/src/main/java/com/shunzhi/parent/db/ChildInfoDao.java
@@ -3,6 +3,7 @@ package com.shunzhi.parent.db;
 import android.content.Context;
 
 import com.j256.ormlite.dao.Dao;
+import com.j256.ormlite.stmt.DeleteBuilder;
 import com.j256.ormlite.stmt.QueryBuilder;
 import com.shunzhi.parent.bean.ChildBean;
 import com.shunzhi.parent.util.DatabaseHelper;
@@ -30,6 +31,16 @@ public class ChildInfoDao {
         }
     }
 
+    public boolean createOrUpdate(ChildBean childBean){
+        try {
+            return dao.createOrUpdate(childBean).getNumLinesChanged() > 0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+
     public boolean onCreate(ChildBean childBean) {
         try {
             return dao.create(childBean) > 0;
@@ -39,7 +50,15 @@ public class ChildInfoDao {
         }
     }
 
-
+    public boolean deleteAll(){
+        try {
+            DeleteBuilder builder = dao.deleteBuilder();
+            return dao.delete(builder.prepare())>0;
+        } catch (SQLException e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
     public synchronized List<ChildBean> getAllChildren() {
         List<ChildBean> children = null;
         try {
diff --git a/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java b/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java
index ca158fc..b42f106 100644
--- a/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java
+++ b/app/src/main/java/com/shunzhi/parent/presenter/mine/MyChildPresenter.java
@@ -59,7 +59,6 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter {
                 } catch (Exception e1) {
                     e1.printStackTrace();
                 }
-
             }
         }));
 
@@ -111,7 +110,6 @@ public class MyChildPresenter extends MyChildContract.MyChildPresenter {
         mRxManager.register(mIModel.unBinnding(parentId, studentId).subscribe(new Consumer<JsonObject>() {
             @Override
             public void accept(JsonObject jsonObject) throws Exception {
-                ToastUtils.showToast(jsonObject.toString());
                 mIView.showError("123");
             }
         }, new Consumer<Throwable>() {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java b/app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java
index 567df5d..d8bafc9 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/activity/ChildDetialActivity.java
@@ -15,11 +15,14 @@ import android.widget.TextView;
 import com.google.gson.Gson;
 import com.share.mvpsdk.base.BasePresenter;
 import com.share.mvpsdk.base.activity.BaseMVPCompatActivity;
+import com.shunzhi.parent.AppConfig;
+import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.bean.ChildBean;
 import com.shunzhi.parent.bean.ChildClass;
 import com.shunzhi.parent.bean.CurrentBean;
 import com.shunzhi.parent.contract.mine.MyChildContract;
+import com.shunzhi.parent.presenter.mine.MyChildPresenter;
 
 import java.util.List;
 
@@ -34,6 +37,7 @@ public class ChildDetialActivity extends BaseMVPCompatActivity<MyChildContract.M
     String childName, cardNumber;
     int studentId;
     int isactivation = 0;
+    ChildBean childBean;
 
     @Override
     protected void initView(Bundle savedInstanceState) {
@@ -63,7 +67,7 @@ public class ChildDetialActivity extends BaseMVPCompatActivity<MyChildContract.M
 
     private void initChild(String childJson) {
         Gson g = new Gson();
-        ChildBean childBean = g.fromJson(childJson, ChildBean.class);
+        childBean = g.fromJson(childJson, ChildBean.class);
         if (!TextUtils.isEmpty(childBean.getCardNumber())) {
             cardNumber = childBean.getCardNumber();
             isactivation = 1;
@@ -97,7 +101,7 @@ public class ChildDetialActivity extends BaseMVPCompatActivity<MyChildContract.M
     @NonNull
     @Override
     public BasePresenter initPresenter() {
-        return null;
+        return new MyChildPresenter();
     }
 
     @Override
@@ -117,7 +121,9 @@ public class ChildDetialActivity extends BaseMVPCompatActivity<MyChildContract.M
 
     @Override
     public void showError(String error) {
-
+        if (error.equals("解绑成功")) ;
+        mPresenter.loadChildList(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME), 0, "");
+        finish();
     }
 
     public void delectChild() {
@@ -143,6 +149,7 @@ public class ChildDetialActivity extends BaseMVPCompatActivity<MyChildContract.M
             public void onClick(View v) {
                 popupWindow.dismiss();
                 backgroundAlpha(1f);
+                mPresenter.unBinndingResult(childBean.getParentId(), childBean.getStudentId());
 
             }
         });
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 91b228e..2f9b5ad 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
@@ -69,41 +69,12 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi
 
     private void initRecyclerView() {
         child_recycle.setLayoutManager(new LinearLayoutManager(this));
-//        child_recycle.smoothOpenRightMenu(0);
-//        child_recycle.setSwipeMenuCreator(swipeMenuCreator);
-//        child_recycle.setSwipeMenuItemClickListener(new SwipeMenuItemClickListener() {
-//            @Override
-//            public void onItemClick(final SwipeMenuBridge menuBridge) {
-//                final PopupWindow popupWindow = new PopupWindow();
-//                popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
-//                popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
-//                backgroundAlpha(0.5f);
-//                View view = LayoutInflater.from(MyChildActivity.this).inflate(R.layout.dialog_view, null);
-//                TextView tv = view.findViewById(R.id.dialog_info);
-//                tv.setText("是否解除绑定？");
-//                TextView btn_cancel = view.findViewById(R.id.cancel_btn);
-//                btn_cancel.setOnClickListener(new View.OnClickListener() {
-//                    @Override
-//                    public void onClick(View v) {
-//                        popupWindow.dismiss();
-//                        backgroundAlpha(1f);
-//                    }
-//                });
-//                TextView btn_right = view.findViewById(R.id.right_btn);
-//                btn_right.setOnClickListener(new View.OnClickListener() {
-//                    @Override
-//                    public void onClick(View v) {
-//                        popupWindow.dismiss();
-//                        backgroundAlpha(1f);
-//                        mPresenter.unBinndingResult(Integer.parseInt(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.PARENT_ID))
-//                                , currlist.get(menuBridge.getAdapterPosition()).getStudentId());
-//                    }
-//                });
-//                popupWindow.setContentView(view);
-//                popupWindow.showAtLocation(child_recycle, Gravity.CENTER, 0, 0);
-//
-//            }
-//        });
+
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
         mPresenter.loadChildList(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME), 0, "");
     }
 
@@ -131,6 +102,7 @@ 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));
@@ -157,8 +129,7 @@ public class MyChildActivity extends BaseMVPCompatActivity<MyChildContract.MyChi
 
     @Override
     public void showError(String error) {
-        if (error.equals("解绑成功")) ;
-        mPresenter.loadChildList(AppConfig.getAppConfig(AppContext.getInstance()).get(AppConfig.LOGIN_NAME), 0, "");
+
     }
 
     private SwipeMenuCreator swipeMenuCreator = new SwipeMenuCreator() {
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ActivationFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ActivationFragment.java
index f08a43d..781f6d6 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ActivationFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ActivationFragment.java
@@ -3,6 +3,7 @@ package com.shunzhi.parent.ui.fragment;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -14,33 +15,34 @@ import com.share.mvpsdk.utils.ToastUtils;
 import com.shunzhi.parent.R;
 import com.shunzhi.parent.contract.apply.ApplyReplaceCardContract;
 import com.shunzhi.parent.presenter.apply.ApplyReplaceCardPresenter;
+import com.shunzhi.parent.views.ReplaceCardDialog;
 
 /**
  * Created by Administrator on 2018/4/19 0019.
  */
 
 public class ActivationFragment extends BaseMVPCompatFragment<ApplyReplaceCardContract.ApplyReplaceCardPreenter, ApplyReplaceCardContract.IApplyReplaceCardModel>
-        implements View.OnClickListener {
+        implements View.OnClickListener, ApplyReplaceCardContract.IApplyReplaceCardView {
 
 
     TextView center_title, tv_name, tv_submit;
     EditText et_cardnum;
     ImageView iv_back;
-
-    String cardNum = "",childName="";
+    ReplaceCardDialog replaceCardDialog = null;
+    String cardNum = "", childName = "";
     int studentId;
 
     @Override
     public void onClick(View v) {
         if (v == tv_submit) {
 
-            if (et_cardnum.getText().toString() != null) {
-                cardNum=et_cardnum.getText().toString();
+            if (!TextUtils.isEmpty(et_cardnum.getText().toString())) {
+                cardNum = et_cardnum.getText().toString();
                 mPresenter.ReplaceCardDetail(studentId, cardNum);
             } else {
                 ToastUtils.showToast("请输入卡号");
             }
-        }else if(v==iv_back){
+        } else if (v == iv_back) {
             getActivity().finish();
         }
 
@@ -61,6 +63,7 @@ public class ActivationFragment extends BaseMVPCompatFragment<ApplyReplaceCardCo
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
         center_title = view.findViewById(R.id.center_title);
         iv_back = view.findViewById(R.id.back_top);
+        iv_back.setOnClickListener(this);
         center_title.setText("校卡激活");
         tv_name = view.findViewById(R.id.tv_name);
 
@@ -83,4 +86,19 @@ public class ActivationFragment extends BaseMVPCompatFragment<ApplyReplaceCardCo
         }
 
     }
+
+    @Override
+    public void showTipsDialog(String msg) {
+        if (msg.equals("true")) {
+            if (replaceCardDialog == null) {
+                replaceCardDialog = new ReplaceCardDialog(getActivity());
+            }
+            replaceCardDialog.setTitle("激活卡提示");
+            replaceCardDialog.setText("卡号：" + cardNum + "\n\n" + "已成功激活!");
+            replaceCardDialog.show();
+
+        } else {
+            ToastUtils.showToast("激活卡失败！");
+        }
+    }
 }
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 196a3f0..1b2f25e 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
@@ -10,20 +10,30 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.support.v7.widget.PopupMenu;
+import android.text.TextUtils;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
 
+import com.google.gson.Gson;
 import com.share.mvpsdk.base.fragment.BaseCompatFragment;
+import com.shunzhi.parent.AppConfig;
+import com.shunzhi.parent.AppContext;
 import com.shunzhi.parent.R;
+import com.shunzhi.parent.bean.ChildBean;
+import com.shunzhi.parent.db.DBControl;
 import com.shunzhi.parent.popu.ShaiXuanPop;
 import com.shunzhi.parent.ui.fragment.report.ChengZhangFragment;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class ReportFragment extends BaseCompatFragment implements View.OnClickListener {
     ViewPager viewPager;
 
-    TextView tvDate, tvShaiXuan, tvNoData;
+    TextView tvDate, tvShaiXuan, tvNoData, tvName;
 
     MyFragmentAdapter myFragmentAdapter = null;
 
@@ -32,6 +42,10 @@ public class ReportFragment extends BaseCompatFragment implements View.OnClickLi
     ChengZhangFragment chengZhangFragment1 = null, chengZhangFragment2 = null;//成长、报告页面
 
     ShaiXuanPop shaiXuanPop = null;
+    List<ChildBean> childlist = new ArrayList<>();
+
+    String jsonStr = "";
+    Gson g = new Gson();
 
     @Override
     public int getLayoutId() {
@@ -42,17 +56,28 @@ public class ReportFragment extends BaseCompatFragment implements View.OnClickLi
     public void initUI(View view, @Nullable Bundle savedInstanceState) {
         viewPager = view.findViewById(R.id.viewPager);
         tvDate = view.findViewById(R.id.tvDate);
+        tvName = view.findViewById(R.id.tvName);
         tvShaiXuan = view.findViewById(R.id.tvShaiXuan);
         tvNoData = view.findViewById(R.id.tvNoData);
         tabLayout = view.findViewById(R.id.tabLayout);
+        tvName.setOnClickListener(this);
+        registerForContextMenu(tvName);
 
-
-
-        tvNoData.setOnClickListener(this);
         tvShaiXuan.setOnClickListener(this);
 
         myFragmentAdapter = new MyFragmentAdapter(getChildFragmentManager());
 
+        childlist = DBControl.childInfoDao.getAllChildren();
+        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);
+        } else {
+            ChildBean childBean = g.fromJson(currChildStr, ChildBean.class);
+            tvName.setText(childBean.getStudentName());
+            jsonStr = currChildStr;
+        }
         viewPager.setAdapter(myFragmentAdapter);
         tabLayout.setupWithViewPager(viewPager);
         tabLayout.removeAllTabs();
@@ -85,6 +110,33 @@ public class ReportFragment extends BaseCompatFragment implements View.OnClickLi
                 if (null == shaiXuanPop) shaiXuanPop = new ShaiXuanPop(getActivity());
                 chengZhangFragment2.showShaixuan(handler);
                 break;
+            case R.id.tvName:
+                showChildName();
+                break;
+        }
+    }
+
+    private void showChildName() {
+        schoolMenu.show();
+    }
+
+    private PopupMenu schoolMenu = 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;
+                }
+            });
         }
     }
 
diff --git a/app/src/main/res/layout/item_school.xml b/app/src/main/res/layout/item_school.xml
index 7ec5558..5484714 100644
--- a/app/src/main/res/layout/item_school.xml
+++ b/app/src/main/res/layout/item_school.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 <LinearLayout
     android:layout_width="fill_parent"
--
libgit2 0.21.0