修改学生信息功能

app/src/main/java/com/ynstkz/shitu/android/activity/HomeActivity.java

@@ -237,17 +237,6 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
         if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION)
                 == PackageManager.PERMISSION_GRANTED) {
                 mlocationClient.startLocation();
-        } else if (ActivityCompat.shouldShowRequestPermissionRationale(this,
-                Manifest.permission.ACCESS_COARSE_LOCATION)) {
-            ConfirmationDialogFragment
-                    .newInstance(R.string.app_name,
-                            new String[]{Manifest.permission.ACCESS_COARSE_LOCATION},
-                            REQUEST_CAMERA_PERMISSION,
-                            R.string.app_name)
-                    .show(getSupportFragmentManager(), FRAGMENT_DIALOG);
-        } else {
-            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_COARSE_LOCATION},
-                    REQUEST_CAMERA_PERMISSION);
         }
     }
 

app/src/main/java/com/ynstkz/shitu/android/activity/StudentInfoActivity.java

@@ -21,13 +21,14 @@ import com.common.library.okhttp.callback.Callback;
 import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.application.STSign;
+import com.ynstkz.shitu.android.base.BaseBean;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.bean.LocalCityBean;
-import com.ynstkz.shitu.android.bean.StudentFamilyInfoBean;
-import com.ynstkz.shitu.android.bean.StudentInfoAddBean;
+import com.ynstkz.shitu.android.bean.StudentFamilyDataBean;
 import com.ynstkz.shitu.android.bean.StudentInfoBean;
+import com.ynstkz.shitu.android.bean.StudentInfoDataBean;
+import com.ynstkz.shitu.android.bean.StudentInfoSaveBean;
 import com.ynstkz.shitu.android.data.RequestGroup;
-import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
 import com.ynstkz.shitu.android.view.ScrollViewWithGridView;
 
 import java.util.ArrayList;
@@ -71,6 +72,8 @@ public class StudentInfoActivity extends TitleBarActivity {
     Button btnSave;
     @Bind(R.id.tv_ProvinceId)
     TextView tvProvinceId;
+    @Bind(R.id.edit_residenceAddress)
+    EditText editResidenceAddress;
 
     //学生信息
     private String birthday;
@@ -79,8 +82,11 @@ public class StudentInfoActivity extends TitleBarActivity {
     private String residenceCityId;
     private String residenceRegionId;
 
+    private String infoId;
+
     //家庭成员信息
-    private List<StudentFamilyInfoBean> listStudentFamilyInfo;
+    private StudentInfoSaveBean studentInfoSaveBean;
+    private List<StudentFamilyDataBean> listStudentFamilyData;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -97,11 +103,10 @@ public class StudentInfoActivity extends TitleBarActivity {
 
     private void initView() {
         tvTitle.setText("学生信息");
-        initFamilyInfo();
     }
 
     private void initData() {
-        listStudentFamilyInfo = new ArrayList<>();
+        studentInfoSaveBean = new StudentInfoSaveBean();
         getStudentInfo();
     }
 
@@ -201,7 +206,24 @@ public class StudentInfoActivity extends TitleBarActivity {
                     showToast("民族不能为空");
                     return;
                 }
-                saveApplyStudentInfo(studentName, birthday, sex + "", ethnic, residenceProvinceId, residenceCityId, residenceRegionId);
+                String residenceAddress = editResidenceAddress.getText().toString().trim();
+                if (TextUtils.isEmpty(residenceAddress)) {
+                    showToast("详细地址不能为空");
+                    return;
+                }
+                StudentInfoDataBean studentInfoBean = new StudentInfoDataBean();
+                studentInfoBean.setInfoId(infoId);
+                studentInfoBean.setStudentName(studentName);
+                studentInfoBean.setBirthday(birthday);
+                studentInfoBean.setSex(sex);
+                studentInfoBean.setEthnic(ethnic);
+                studentInfoBean.setResidenceProvinceId(residenceProvinceId);
+                studentInfoBean.setResidenceCityId(residenceCityId);
+                studentInfoBean.setResidenceRegionId(residenceRegionId);
+                studentInfoBean.setResidenceAddress(residenceAddress);
+                studentInfoSaveBean.setStudentInfo(studentInfoBean);
+                studentInfoSaveBean.setFamilyList(saveApplyFamilyInfo());
+                saveApplyStudentInfo(studentInfoSaveBean);
             }
         });
     }
@@ -247,15 +269,33 @@ public class StudentInfoActivity extends TitleBarActivity {
         if (dataBean == null) {
             return;
         }
-        StudentInfoBean.DataBean.InfoBean infoBean = dataBean.getStudentInfo();
-        if (infoBean != null) {
-            editUsername.setText(infoBean.getStudentName());
-            tvBirthday.setText(infoBean.getBirthday());
-            sex = infoBean.getSex();
+        StudentInfoDataBean studentInfoData = dataBean.getStudentInfo();
+        if (studentInfoData != null) {
+            infoId = studentInfoData.getInfoId() + "";
+            editUsername.setText(studentInfoData.getStudentName());
+            tvBirthday.setText(studentInfoData.getBirthday().substring(0,10));
+            birthday = tvBirthday.getText().toString().trim();
+            sex = studentInfoData.getSex();
             tvSex.setText(getResources().getStringArray(R.array.choose_sex)[sex]);
-            editNation.setText(infoBean.getEthnic());
-            residenceCityId = infoBean.getResidenceCityId() + "";
-
+            editNation.setText(studentInfoData.getEthnic());
+            residenceProvinceId = studentInfoData.getResidenceProvinceId() + "";
+            residenceCityId = studentInfoData.getResidenceCityId() + "";
+            residenceRegionId = studentInfoData.getResidenceRegionId() + "";
+            //户口所在地
+            searchCityById("01", "", residenceProvinceId);
+            searchCityById("02", residenceProvinceId, residenceCityId);
+            searchCityById("03", residenceCityId, residenceRegionId);
+            editResidenceAddress.setText(studentInfoData.getResidenceAddress());
+
+            if(dataBean.getFamilyList() != null && dataBean.getFamilyList().size() > 0 ){
+                listStudentFamilyData = dataBean.getFamilyList();
+                initFamilyInfo(listStudentFamilyData);
+            } else {
+                StudentFamilyDataBean studentFamilyDataBean = new StudentFamilyDataBean();
+                listStudentFamilyData= new ArrayList<>();
+                listStudentFamilyData.add(studentFamilyDataBean);
+                initFamilyInfo(listStudentFamilyData);
+            }
         }
     }
 
@@ -296,7 +336,7 @@ public class StudentInfoActivity extends TitleBarActivity {
                                 listDialog.setItems(cityNames, new DialogInterface.OnClickListener() {
                                     @Override
                                     public void onClick(DialogInterface dialogInterface, int i) {
-                                        if("01".equals(type)){
+                                        if ("01".equals(type)) {
                                             residenceProvinceId = dataBean.get(i).getRegionId() + "";
                                             tvProvinceId.setText(dataBean.get(i).getRegionName());
                                         } else if ("02".equals(type)) {
@@ -320,15 +360,16 @@ public class StudentInfoActivity extends TitleBarActivity {
     }
 
     /**
-     * 保存学生信息
+     * 搜索城市根据ID
+     *
+     * @param type
+     * @param parentId
      */
-    private void saveApplyStudentInfo(String studentName, String birthday, String sex, String ethnic, String residenceProvinceId,
-                                      String residenceCityId, String residenceRegionId) {
-
-        RequestGroup.saveApplyStudentInfo(studentName, birthday, sex, ethnic, residenceProvinceId, residenceCityId, residenceRegionId, new Callback() {
+    private void searchCityById(final String type, String parentId, final String locationId) {
+        RequestGroup.getLocalCity(parentId, new Callback() {
             @Override
             public Object parseNetworkResponse(Response response, int id) throws Exception {
-                return new Gson().fromJson(response.body().string(), StudentInfoAddBean.class);
+                return new Gson().fromJson(response.body().string(), LocalCityBean.class);
             }
 
             @Override
@@ -338,12 +379,32 @@ public class StudentInfoActivity extends TitleBarActivity {
 
             @Override
             public void onResponse(Object response, int id) {
-                StudentInfoAddBean studentInfoAddBean = (StudentInfoAddBean) response;
-                if (studentInfoAddBean != null) {
-                    if ("200".equals(studentInfoAddBean.getCode())) {
-                        saveApplyFamilyInfo(studentInfoAddBean.getData() + "");
+                LocalCityBean localCityBean = (LocalCityBean) response;
+                if (localCityBean != null) {
+                    if ("200".equals(localCityBean.getCode())) {
+                        if (localCityBean.getData() != null) {
+                            final List<LocalCityBean.DataBean> dataBean = localCityBean.getData();
+                            if (dataBean != null && dataBean.size() > 0) {
+                                for (int i = 0; i < dataBean.size(); i++) {
+                                    String regionId = dataBean.get(i).getRegionId() + "";
+                                    if ("01".equals(type)) {
+                                        if (regionId.equals(locationId)) {
+                                            tvProvinceId.setText(dataBean.get(i).getRegionName());
+                                        }
+                                    } else if ("02".equals(type)) {
+                                        if (regionId.equals(locationId)) {
+                                            tvResidenceCityId.setText(dataBean.get(i).getRegionName());
+                                        }
+                                    } else if ("03".equals(type)) {
+                                        if (regionId.equals(locationId)) {
+                                            tvResidenceRegionId.setText(dataBean.get(i).getRegionName());
+                                        }
+                                    }
+                                }
+                            }
+                        }
                     } else {
-                        showToast(studentInfoAddBean.getMsg());
+                        showToast(localCityBean.getMsg());
                     }
                 }
             }
@@ -352,35 +413,14 @@ public class StudentInfoActivity extends TitleBarActivity {
     }
 
     /**
-     * 保存家庭成员信息
+     * 保存学生信息
      */
-    private void saveApplyFamilyInfo(String studentId) {
-        if (llMemberFamily.getChildCount() > 0) {
-            for (int i = 0; i < llMemberFamily.getChildCount(); i++) {
-                LinearLayout viewMemberFamilyItem = (LinearLayout) llMemberFamily.getChildAt(i);
-
-                String relationShip = ((EditText) viewMemberFamilyItem.findViewById(R.id.edit_relation)).getText().toString().trim();
-                String tv_familyName = ((EditText) viewMemberFamilyItem.findViewById(R.id.tv_familyName)).getText().toString().trim();
-                String familyPhone = ((EditText) viewMemberFamilyItem.findViewById(R.id.edit_familyPhone)).getText().toString().trim();
-                String job = ((EditText) viewMemberFamilyItem.findViewById(R.id.edit_job)).getText().toString().trim();
-                String remark = ((EditText) viewMemberFamilyItem.findViewById(R.id.edit_remark)).getText().toString().trim();
+    private void saveApplyStudentInfo(StudentInfoSaveBean studentInfoSaveBean) {
 
-                StudentFamilyInfoBean studentFamilyInfoBean = new StudentFamilyInfoBean();
-                studentFamilyInfoBean.setRelationShip(relationShip);
-                studentFamilyInfoBean.setFamilyName(tv_familyName);
-                studentFamilyInfoBean.setFamilyPhone(familyPhone);
-                studentFamilyInfoBean.setJob(job);
-                studentFamilyInfoBean.setRemark(remark);
-                studentFamilyInfoBean.setStudentInfoId(studentId);
-                studentFamilyInfoBean.setUserId(SharedPreferencesUtils.getUserId());
-                listStudentFamilyInfo.add(studentFamilyInfoBean);
-            }
-        }
-
-        RequestGroup.applyFamilyInfo(listStudentFamilyInfo, new Callback() {
+        RequestGroup.saveApplyStudentInfo(studentInfoSaveBean, new Callback() {
             @Override
             public Object parseNetworkResponse(Response response, int id) throws Exception {
-                return new Gson().fromJson(response.body().string(), StudentInfoAddBean.class);
+                return new Gson().fromJson(response.body().string(), BaseBean.class);
             }
 
             @Override
@@ -390,47 +430,82 @@ public class StudentInfoActivity extends TitleBarActivity {
 
             @Override
             public void onResponse(Object response, int id) {
-                StudentInfoAddBean studentInfoAddBean = (StudentInfoAddBean) response;
-                if (studentInfoAddBean != null) {
-                    if ("200".equals(studentInfoAddBean.getCode())) { //提交家庭信息成功
+                BaseBean baseBean = (BaseBean) response;
+                if (baseBean != null) {
+                    showToast(baseBean.getMsg());
+                    if ("200".equals(baseBean.getCode())) {
                         finish();
                     }
-                    showToast(studentInfoAddBean.getMsg());
                 }
             }
         });
     }
 
-    /**
-     * 初始化家庭成员信息
-     */
-    private void initFamilyInfo() {
-        llMemberFamily.removeAllViews();
-        View familyView = LayoutInflater.from(this).inflate(R.layout.item_student_family, null);
-        TextView tvFamilyLab = familyView.findViewById(R.id.tv_family_lab);
-        tvFamilyLab.setText("家庭成员1");
-        ImageView ivFamilyAdd = familyView.findViewById(R.id.iv_family_add);
-        //添加成员
-        ivFamilyAdd.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                final View familyView = LayoutInflater.from(StudentInfoActivity.this).inflate(R.layout.item_student_family, null);
-                TextView tvFamilyLab = familyView.findViewById(R.id.tv_family_lab);
+    private void initFamilyInfo(final List<StudentFamilyDataBean> familyListBean){
+        if(familyListBean != null && familyListBean.size() > 0) {
+            llMemberFamily.removeAllViews();
+            for(int i=0; i<familyListBean.size(); i++) {
+
+                final StudentFamilyDataBean familyListItem = familyListBean.get(i);
+                View familyView = LayoutInflater.from(this).inflate(R.layout.item_student_family, null);
                 ImageView ivFamilyAdd = familyView.findViewById(R.id.iv_family_add);
-                ivFamilyAdd.setImageResource(R.drawable.family_info_remove_icon);
+
+                ((TextView)familyView.findViewById(R.id.tv_framily_id)).setText(familyListItem.getFamilyId()+"");
+                ((EditText)familyView.findViewById(R.id.edit_relation)).setText(familyListItem.getRelationShip());
+                ((EditText)familyView.findViewById(R.id.tv_familyName)).setText(familyListItem.getFamilyName());
+                ((EditText)familyView.findViewById(R.id.edit_familyPhone)).setText(familyListItem.getFamilyPhone());
+
+                if(i == 0){
+                    ivFamilyAdd.setImageResource(R.drawable.family_info_add_icon);
+                    ivFamilyAdd.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            StudentFamilyDataBean addfamily = new StudentFamilyDataBean();
+                            familyListBean.add(addfamily);
+                            initFamilyInfo(familyListBean);
+                        }
+                    });
+                } else {
+                    ivFamilyAdd.setImageResource(R.drawable.family_info_remove_icon);
+                    ivFamilyAdd.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            familyListBean.remove(familyListItem);
+                            deleteStudentFamily(familyListItem.getFamilyId());
+                            initFamilyInfo(familyListBean);
+                        }
+                    });
+                }
                 llMemberFamily.addView(familyView);
-                ivFamilyAdd.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View view) {
-                        llMemberFamily.removeView(familyView);
-                        refreshFamilyLab();
-                    }
-                });
-                tvFamilyLab.setText("家庭成员" + llMemberFamily.getChildCount());
+            }
+            refreshFamilyLab();
+        }
+    }
 
+        /**
+     * 保存家庭成员信息
+     */
+    private List<StudentFamilyDataBean> saveApplyFamilyInfo() {
+        if (llMemberFamily.getChildCount() > 0) {
+            List<StudentFamilyDataBean> listStudentFamilyInfo = new ArrayList<>();
+            for (int i = 0; i < llMemberFamily.getChildCount(); i++) {
+                LinearLayout viewMemberFamilyItem = (LinearLayout) llMemberFamily.getChildAt(i);
+                String familyId = ((TextView) viewMemberFamilyItem.findViewById(R.id.tv_framily_id)).getText().toString().trim();
+                String relationShip = ((EditText) viewMemberFamilyItem.findViewById(R.id.edit_relation)).getText().toString().trim();
+                String tv_familyName = ((EditText) viewMemberFamilyItem.findViewById(R.id.tv_familyName)).getText().toString().trim();
+                String familyPhone = ((EditText) viewMemberFamilyItem.findViewById(R.id.edit_familyPhone)).getText().toString().trim();
+                StudentFamilyDataBean studentFamilyInfoBean = new StudentFamilyDataBean();
+                studentFamilyInfoBean.setRelationShip(relationShip);
+                studentFamilyInfoBean.setFamilyName(tv_familyName);
+                studentFamilyInfoBean.setFamilyPhone(familyPhone);
+                listStudentFamilyInfo.add(studentFamilyInfoBean);
+                if(!TextUtils.isEmpty(familyId) && !"null".equals(familyId)) {
+                    studentFamilyInfoBean.setFamilyId(familyId);
+                }
             }
-        });
-        llMemberFamily.addView(familyView);
+            return listStudentFamilyInfo;
+        }
+        return new ArrayList<>();
     }
 
     private void refreshFamilyLab() {
@@ -442,4 +517,37 @@ public class StudentInfoActivity extends TitleBarActivity {
             }
         }
     }
+
+    /**
+     * 删除家庭信息
+     * @param familyId
+     */
+    private void deleteStudentFamily(String familyId){
+
+        if(TextUtils.isEmpty(familyId)){
+            return;
+        }
+
+        RequestGroup.deleteStudentFamily(familyId, new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return new Gson().fromJson(response.body().string(), BaseBean.class);
+            }
+
+            @Override
+            public void onError(Call call, Exception e, int id) {
+                showToast(getString(R.string.error_msg));
+            }
+
+            @Override
+            public void onResponse(Object response, int id) {
+                BaseBean baseBean = (BaseBean)response;
+                if(baseBean != null){
+                    if(!"200".equals(baseBean.getCode())) {
+                        showToast(baseBean.getMsg());
+                    }
+                }
+            }
+        });
+    }
 }

app/src/main/java/com/ynstkz/shitu/android/bean/StudentFamilyDataBean.java

@@ -0,0 +1,64 @@
+package com.ynstkz.shitu.android.bean;
+
+import com.ynstkz.shitu.android.base.BaseBean;
+
+/**
+ * 作者：fuchangle on 2018/4/27 16:51
+ */
+
+public class StudentFamilyDataBean extends BaseBean{
+
+    /**
+     * familyId : 104
+     * userId : 74
+     * studentInfoId : 140
+     * relationShip : 父子
+     * familyName : 未知1
+     * familyPhone : 18561761888
+     * job : 单位
+     * jobAddress : null
+     * remark : 备注1
+     * createTime : 1524723432000
+     * updateTime : 1524723432000
+     * isDelete : 0
+     */
+
+    private String familyId;
+    private String relationShip;
+    private String familyName;
+    private String familyPhone;
+
+    public String getFamilyId() {
+        return familyId;
+    }
+
+    public void setFamilyId(String familyId) {
+        this.familyId = familyId;
+    }
+
+
+    public String getRelationShip() {
+        return relationShip;
+    }
+
+    public void setRelationShip(String relationShip) {
+        this.relationShip = relationShip;
+    }
+
+    public String getFamilyName() {
+        return familyName;
+    }
+
+    public void setFamilyName(String familyName) {
+        this.familyName = familyName;
+    }
+
+    public String getFamilyPhone() {
+        return familyPhone;
+    }
+
+    public void setFamilyPhone(String familyPhone) {
+        this.familyPhone = familyPhone;
+    }
+
+}

app/src/main/java/com/ynstkz/shitu/android/bean/StudentFamilyInfoBean.java

@@ -1,105 +0,0 @@
-package com.ynstkz.shitu.android.bean;
-
-import com.ynstkz.shitu.android.base.BaseBean;
-
-/**
- * 作者：fuchangle on 2018/4/19 11:06
- */
-
-public class StudentFamilyInfoBean extends BaseBean{
-
-
-    /**
-     * familyName :
-     * relationShip :
-     * familyPhone :
-     * job :
-     * jobAddress :
-     * remark :
-     * familyId : 0
-     * studentInfoId : 63
-     * userId : 36
-     */
-
-    private String familyName;
-    private String relationShip;
-    private String familyPhone;
-    private String job;
-    private String jobAddress;
-    private String remark;
-    private String familyId;
-    private String studentInfoId;
-    private String userId;
-
-    public String getFamilyName() {
-        return familyName;
-    }
-
-    public void setFamilyName(String familyName) {
-        this.familyName = familyName;
-    }
-
-    public String getRelationShip() {
-        return relationShip;
-    }
-
-    public void setRelationShip(String relationShip) {
-        this.relationShip = relationShip;
-    }
-
-    public String getFamilyPhone() {
-        return familyPhone;
-    }
-
-    public void setFamilyPhone(String familyPhone) {
-        this.familyPhone = familyPhone;
-    }
-
-    public String getJob() {
-        return job;
-    }
-
-    public void setJob(String job) {
-        this.job = job;
-    }
-
-    public String getJobAddress() {
-        return jobAddress;
-    }
-
-    public void setJobAddress(String jobAddress) {
-        this.jobAddress = jobAddress;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getFamilyId() {
-        return familyId;
-    }
-
-    public void setFamilyId(String familyId) {
-        this.familyId = familyId;
-    }
-
-    public String getStudentInfoId() {
-        return studentInfoId;
-    }
-
-    public void setStudentInfoId(String studentInfoId) {
-        this.studentInfoId = studentInfoId;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-}

app/src/main/java/com/ynstkz/shitu/android/bean/StudentInfoAddBean.java

@@ -1,20 +0,0 @@
-package com.ynstkz.shitu.android.bean;
-
-import com.ynstkz.shitu.android.base.BaseBean;
-
-/**
- * 作者：fuchangle on 2018/4/19 10:41
- */
-
-public class StudentInfoAddBean extends BaseBean{
-
-    private int data;
-
-    public int getData() {
-        return data;
-    }
-
-    public void setData(int data) {
-        this.data = data;
-    }
-}

app/src/main/java/com/ynstkz/shitu/android/bean/StudentInfoBean.java

@@ -28,252 +28,24 @@ public class StudentInfoBean extends BaseBean{
          * familyList : [{"familyId":104,"userId":74,"studentInfoId":140,"relationShip":"父子","familyName":"未知1","familyPhone":"18561761888","job":"单位","jobAddress":null,"remark":"备注1","createTime":1524723432000,"updateTime":1524723432000,"isDelete":0}]
          */
 
-        private InfoBean studentInfo;
-        private List<FamilyListBean> familyList;
+        private StudentInfoDataBean studentInfo;
+        private List<StudentFamilyDataBean> familyList;
 
-        public InfoBean getStudentInfo() {
+        public StudentInfoDataBean getStudentInfo() {
             return studentInfo;
         }
 
-        public void setStudentInfo(InfoBean studentInfo) {
+        public void setStudentInfo(StudentInfoDataBean studentInfo) {
             this.studentInfo = studentInfo;
         }
 
-        public List<FamilyListBean> getFamilyList() {
+        public List<StudentFamilyDataBean> getFamilyList() {
             return familyList;
         }
 
-        public void setFamilyList(List<FamilyListBean> familyList) {
+        public void setFamilyList(List<StudentFamilyDataBean> familyList) {
             this.familyList = familyList;
         }
 
-        public static class InfoBean {
-
-            private int infoId;
-            private int userId;
-            private String studentName;
-            private String birthday;
-            private int sex;
-            private String ethnic;
-            private String nativePlace;
-            private int residenceProvinceId;
-            private int residenceCityId;
-            private int residenceRegionId;
-            private String residenceAddress;
-
-            public int getInfoId() {
-                return infoId;
-            }
-
-            public void setInfoId(int infoId) {
-                this.infoId = infoId;
-            }
-
-            public int getUserId() {
-                return userId;
-            }
-
-            public void setUserId(int userId) {
-                this.userId = userId;
-            }
-
-            public String getStudentName() {
-                return studentName;
-            }
-
-            public void setStudentName(String studentName) {
-                this.studentName = studentName;
-            }
-
-            public String getBirthday() {
-                return birthday;
-            }
-
-            public void setBirthday(String birthday) {
-                this.birthday = birthday;
-            }
-
-            public int getSex() {
-                return sex;
-            }
-
-            public void setSex(int sex) {
-                this.sex = sex;
-            }
-
-            public String getEthnic() {
-                return ethnic;
-            }
-
-            public void setEthnic(String ethnic) {
-                this.ethnic = ethnic;
-            }
-
-            public String getNativePlace() {
-                return nativePlace;
-            }
-
-            public void setNativePlace(String nativePlace) {
-                this.nativePlace = nativePlace;
-            }
-
-            public int getResidenceProvinceId() {
-                return residenceProvinceId;
-            }
-
-            public void setResidenceProvinceId(int residenceProvinceId) {
-                this.residenceProvinceId = residenceProvinceId;
-            }
-
-            public int getResidenceCityId() {
-                return residenceCityId;
-            }
-
-            public void setResidenceCityId(int residenceCityId) {
-                this.residenceCityId = residenceCityId;
-            }
-
-            public int getResidenceRegionId() {
-                return residenceRegionId;
-            }
-
-            public void setResidenceRegionId(int residenceRegionId) {
-                this.residenceRegionId = residenceRegionId;
-            }
-
-            public String getResidenceAddress() {
-                return residenceAddress;
-            }
-
-            public void setResidenceAddress(String residenceAddress) {
-                this.residenceAddress = residenceAddress;
-            }
-        }
-
-        public static class FamilyListBean {
-            /**
-             * familyId : 104
-             * userId : 74
-             * studentInfoId : 140
-             * relationShip : 父子
-             * familyName : 未知1
-             * familyPhone : 18561761888
-             * job : 单位
-             * jobAddress : null
-             * remark : 备注1
-             * createTime : 1524723432000
-             * updateTime : 1524723432000
-             * isDelete : 0
-             */
-
-            private int familyId;
-            private int userId;
-            private int studentInfoId;
-            private String relationShip;
-            private String familyName;
-            private String familyPhone;
-            private String job;
-            private Object jobAddress;
-            private String remark;
-            private long createTime;
-            private long updateTime;
-            private int isDelete;
-
-            public int getFamilyId() {
-                return familyId;
-            }
-
-            public void setFamilyId(int familyId) {
-                this.familyId = familyId;
-            }
-
-            public int getUserId() {
-                return userId;
-            }
-
-            public void setUserId(int userId) {
-                this.userId = userId;
-            }
-
-            public int getStudentInfoId() {
-                return studentInfoId;
-            }
-
-            public void setStudentInfoId(int studentInfoId) {
-                this.studentInfoId = studentInfoId;
-            }
-
-            public String getRelationShip() {
-                return relationShip;
-            }
-
-            public void setRelationShip(String relationShip) {
-                this.relationShip = relationShip;
-            }
-
-            public String getFamilyName() {
-                return familyName;
-            }
-
-            public void setFamilyName(String familyName) {
-                this.familyName = familyName;
-            }
-
-            public String getFamilyPhone() {
-                return familyPhone;
-            }
-
-            public void setFamilyPhone(String familyPhone) {
-                this.familyPhone = familyPhone;
-            }
-
-            public String getJob() {
-                return job;
-            }
-
-            public void setJob(String job) {
-                this.job = job;
-            }
-
-            public Object getJobAddress() {
-                return jobAddress;
-            }
-
-            public void setJobAddress(Object jobAddress) {
-                this.jobAddress = jobAddress;
-            }
-
-            public String getRemark() {
-                return remark;
-            }
-
-            public void setRemark(String remark) {
-                this.remark = remark;
-            }
-
-            public long getCreateTime() {
-                return createTime;
-            }
-
-            public void setCreateTime(long createTime) {
-                this.createTime = createTime;
-            }
-
-            public long getUpdateTime() {
-                return updateTime;
-            }
-
-            public void setUpdateTime(long updateTime) {
-                this.updateTime = updateTime;
-            }
-
-            public int getIsDelete() {
-                return isDelete;
-            }
-
-            public void setIsDelete(int isDelete) {
-                this.isDelete = isDelete;
-            }
-        }
     }
 }

app/src/main/java/com/ynstkz/shitu/android/bean/StudentInfoDataBean.java

@@ -0,0 +1,110 @@
+package com.ynstkz.shitu.android.bean;
+
+import com.ynstkz.shitu.android.base.BaseBean;
+
+/**
+ * 作者：fuchangle on 2018/4/27 16:46
+ */
+
+public class StudentInfoDataBean extends BaseBean{
+
+    private String infoId;
+    private int userId;
+    private String studentName;
+    private String birthday;
+    private int sex;
+    private String ethnic;
+    private String nativePlace;
+    private String residenceProvinceId;
+    private String residenceCityId;
+    private String residenceRegionId;
+    private String residenceAddress;
+
+    public String getInfoId() {
+        return infoId;
+    }
+
+    public void setInfoId(String infoId) {
+        this.infoId = infoId;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public int getSex() {
+        return sex;
+    }
+
+    public void setSex(int sex) {
+        this.sex = sex;
+    }
+
+    public String getEthnic() {
+        return ethnic;
+    }
+
+    public void setEthnic(String ethnic) {
+        this.ethnic = ethnic;
+    }
+
+    public String getNativePlace() {
+        return nativePlace;
+    }
+
+    public void setNativePlace(String nativePlace) {
+        this.nativePlace = nativePlace;
+    }
+
+    public String getResidenceProvinceId() {
+        return residenceProvinceId;
+    }
+
+    public void setResidenceProvinceId(String residenceProvinceId) {
+        this.residenceProvinceId = residenceProvinceId;
+    }
+
+    public String getResidenceCityId() {
+        return residenceCityId;
+    }
+
+    public void setResidenceCityId(String residenceCityId) {
+        this.residenceCityId = residenceCityId;
+    }
+
+    public String getResidenceRegionId() {
+        return residenceRegionId;
+    }
+
+    public void setResidenceRegionId(String residenceRegionId) {
+        this.residenceRegionId = residenceRegionId;
+    }
+
+    public String getResidenceAddress() {
+        return residenceAddress;
+    }
+
+    public void setResidenceAddress(String residenceAddress) {
+        this.residenceAddress = residenceAddress;
+    }
+}

app/src/main/java/com/ynstkz/shitu/android/bean/StudentInfoSaveBean.java

@@ -0,0 +1,34 @@
+package com.ynstkz.shitu.android.bean;
+
+import com.ynstkz.shitu.android.base.BaseBean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 作者：fuchangle on 2018/4/27 15:41
+ */
+
+public class StudentInfoSaveBean extends BaseBean{
+
+
+    private StudentInfoDataBean studentInfo;
+    private List<StudentFamilyDataBean> familyList;
+
+    public StudentInfoDataBean getStudentInfo() {
+        return studentInfo;
+    }
+
+    public void setStudentInfo(StudentInfoDataBean studentInfo) {
+        this.studentInfo = studentInfo;
+    }
+
+    public List<StudentFamilyDataBean> getFamilyList() {
+        return familyList;
+    }
+
+    public void setFamilyList(List<StudentFamilyDataBean> familyList) {
+        this.familyList = familyList;
+    }
+
+}

app/src/main/java/com/ynstkz/shitu/android/data/RequestGroup.java

@@ -2,19 +2,13 @@ package com.ynstkz.shitu.android.data;
 
 import android.text.TextUtils;
 
-import com.common.library.cache.Cache;
 import com.common.library.okhttp.OkHttpUtils;
 import com.common.library.okhttp.callback.Callback;
 import com.google.gson.Gson;
-import com.ynstkz.shitu.android.application.STSign;
-import com.ynstkz.shitu.android.bean.StudentFamilyInfoBean;
-import com.ynstkz.shitu.android.bean.UserInfoBean;
-import com.ynstkz.shitu.android.common.Constants;
+import com.ynstkz.shitu.android.bean.StudentInfoSaveBean;
 
 import java.io.File;
-import java.net.URL;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -462,18 +456,9 @@ public class RequestGroup {
      residenceAddress (string, optional): 户口所在地详细地址 ,
      hobby (string, optional): 兴趣爱好
      */
-    public static void saveApplyStudentInfo(String studentName, String birthday, String sex, String ethnic, String residenceProvinceId,
-                                            String residenceCityId, String residenceRegionId, Callback callback){
-        Map<String, String> params = getSystemParams();
-        params.put("studentName", studentName);
-        params.put("birthday", birthday);
-        params.put("sex", sex);
-        params.put("ethnic", ethnic);
-        params.put("residenceProvinceId", residenceProvinceId);
-        params.put("residenceCityId", residenceCityId);
-        params.put("residenceRegionId", residenceRegionId);
+    public static void saveApplyStudentInfo(StudentInfoSaveBean studentInfoSaveBean, Callback callback){
         OkHttpUtils.postString().url(UrlCat.URL_APPLY_STUDENT_INFO).addHeader(KEY_TOKEN,
-                SharedPreferencesUtils.getToken()).content(new Gson().toJson(params)).build().execute(callback);
+                SharedPreferencesUtils.getToken()).content(new Gson().toJson(studentInfoSaveBean)).build().execute(callback);
     }
 
     /**
@@ -489,19 +474,21 @@ public class RequestGroup {
     }
 
     /**
-     * 报名-家庭成员信息
+     * 获取学生信息
      */
-    public static void applyFamilyInfo(List<StudentFamilyInfoBean> listStudentFamily, Callback callback){
-        OkHttpUtils.postString().url(UrlCat.URL_APPLY_FAMILY).addHeader(KEY_TOKEN,
-                SharedPreferencesUtils.getToken()).content(new Gson().toJson(listStudentFamily)).build().execute(callback);
+    public static void getStudentInfo(Callback callback){
+        Map<String, String> params = getSystemParams();
+        OkHttpUtils.get().url(UrlCat.URL_GET_STUDENT_INGO).addHeader(KEY_TOKEN,
+                SharedPreferencesUtils.getToken()).params(params).build().execute(callback);
     }
 
     /**
-     * 获取学生信息
+     * 删除家庭成员信息
      */
-    public static void getStudentInfo(Callback callback){
+    public static void deleteStudentFamily(String familyId, Callback callback){
         Map<String, String> params = getSystemParams();
-        OkHttpUtils.get().url(UrlCat.URL_GET_STUDENT_INGO).addHeader(KEY_TOKEN,
+        params.put("familyId", familyId);
+        OkHttpUtils.post().url(UrlCat.URL_DELETE_FAMILY).addHeader(KEY_TOKEN,
                 SharedPreferencesUtils.getToken()).params(params).build().execute(callback);
     }
 }

app/src/main/java/com/ynstkz/shitu/android/data/UrlCat.java

@@ -197,9 +197,9 @@ public class UrlCat {
     public static final String URL_APPLY_P47 = HOST + "p43.html";
 
     /**
-     * 报名-学生信息
+     * 保存学生信息
      */
-    public static final String URL_APPLY_STUDENT_INFO = HOST + "api/apply/student/info";
+    public static final String URL_APPLY_STUDENT_INFO = HOST + "api/user/student/info/save";
 
     /**
      * 新用户第三方登录默认注册,默认密码888888
@@ -207,14 +207,14 @@ public class UrlCat {
     public static final String URL_THIRD_REGIST = HOST + "api/third/reg";
 
     /**
-     * 家庭成员信息
+     * 学生信息
      */
-    public static final String URL_APPLY_FAMILY = HOST + "api/apply/family/info";
+    public static final String URL_GET_STUDENT_INGO = HOST + "api/user/student/info";
 
     /**
-     * 学生信息
+     * 删除家长信息
      */
-    public static final String URL_GET_STUDENT_INGO = HOST + "api/user/student/info";
+    public static final String URL_DELETE_FAMILY = HOST + "api/user/family/delete";
 }
 
 

app/src/main/res/layout/activity_studentinfo.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include layout="@layout/view_title"/>
+    <include layout="@layout/view_title" />
 
     <ScrollView
         android:layout_width="match_parent"
@@ -135,61 +135,77 @@
 
             <include layout="@layout/view_default_line" />
 
-            <RelativeLayout
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:padding="@dimen/default_content_margin">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:text="户口所在地"
-                    android:textColor="@color/color_666"
-                    android:textSize="@dimen/company_16sp" />
+                android:orientation="vertical">
 
-                <LinearLayout
+                <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_marginLeft="@dimen/student_info_leftpadding">
-
-                    <TextView
-                        android:id="@+id/tv_ProvinceId"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:drawableRight="@drawable/student_location_select"
-                        android:text="选择省"
-                        android:textColor="@color/color_999"
-                        android:textSize="@dimen/company_16sp" />
+                    android:padding="@dimen/default_content_margin">
 
                     <TextView
-                        android:id="@+id/tv_residenceCityId"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:layout_marginLeft="@dimen/company_20dp"
-                        android:drawableRight="@drawable/student_location_select"
-                        android:text="选择市"
-                        android:textColor="@color/color_999"
+                        android:text="户口所在地"
+                        android:textColor="@color/color_666"
                         android:textSize="@dimen/company_16sp" />
 
-                    <TextView
-                        android:id="@+id/tv_residenceRegionId"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:layout_marginLeft="@dimen/company_20dp"
-                        android:drawableRight="@drawable/student_location_select"
-                        android:text="选择区"
-                        android:textColor="@color/color_999"
-                        android:textSize="@dimen/company_16sp" />
+                        android:layout_marginLeft="@dimen/student_info_leftpadding">
+
+                        <TextView
+                            android:id="@+id/tv_ProvinceId"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:drawableRight="@drawable/student_location_select"
+                            android:text="选择省"
+                            android:textColor="@color/color_999"
+                            android:textSize="@dimen/company_16sp" />
+
+                        <TextView
+                            android:id="@+id/tv_residenceCityId"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="@dimen/company_20dp"
+                            android:drawableRight="@drawable/student_location_select"
+                            android:text="选择市"
+                            android:textColor="@color/color_999"
+                            android:textSize="@dimen/company_16sp" />
+
+                        <TextView
+                            android:id="@+id/tv_residenceRegionId"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginLeft="@dimen/company_20dp"
+                            android:drawableRight="@drawable/student_location_select"
+                            android:text="选择区"
+                            android:textColor="@color/color_999"
+                            android:textSize="@dimen/company_16sp" />
+
+                    </LinearLayout>
+
+                </RelativeLayout>
 
-                </LinearLayout>
+                <EditText
+                    android:id="@+id/edit_residenceAddress"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="100dp"
+                    android:background="@null"
+                    android:hint="请输入详情地址"
+                    android:textColor="@color/color_999"
+                    android:textSize="@dimen/company_16sp" />
 
-            </RelativeLayout>
+            </LinearLayout>
 
             <include layout="@layout/view_default_line" />
 
@@ -205,20 +221,20 @@
                 android:id="@+id/gv_images"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:numColumns="2"/>
+                android:numColumns="2" />
 
             <Button
                 android:id="@+id/btn_save"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/company_50dp"
-                android:layout_marginTop="@dimen/company_20dp"
+                android:layout_marginBottom="@dimen/company_20dp"
                 android:layout_marginLeft="@dimen/default_content_margin"
                 android:layout_marginRight="@dimen/default_content_margin"
+                android:layout_marginTop="@dimen/company_20dp"
                 android:background="@drawable/shape_default_btn_bg"
-                android:layout_marginBottom="@dimen/company_20dp"
+                android:text="保存"
                 android:textColor="@color/white"
-                android:textSize="@dimen/company_16sp"
-                android:text="保存"/>
+                android:textSize="@dimen/company_16sp" />
 
         </LinearLayout>
 

app/src/main/res/layout/item_student_family.xml

@@ -4,6 +4,12 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <TextView
+        android:id="@+id/tv_framily_id"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"/>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -91,66 +97,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-
-        android:padding="@dimen/default_content_margin">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="工作单位"
-            android:textColor="@color/color_666"
-            android:textSize="@dimen/company_16sp" />
-
-        <EditText
-            android:id="@+id/edit_job"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/student_info_leftpadding"
-            android:background="@null"
-            android:hint="请输入"
-            android:textColor="@color/color_999"
-            android:textSize="@dimen/company_16sp" />
-
-    </RelativeLayout>
-
-    <include layout="@layout/view_default_line" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-
-        android:padding="@dimen/default_content_margin">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="职务"
-            android:textColor="@color/color_666"
-            android:textSize="@dimen/company_16sp" />
-
-        <EditText
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/student_info_leftpadding"
-            android:background="@null"
-            android:hint="请输入"
-            android:textColor="@color/color_999"
-            android:textSize="@dimen/company_16sp" />
-
-    </RelativeLayout>
-
-    <include layout="@layout/view_default_line" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-
         android:padding="@dimen/default_content_margin">
 
         <TextView
@@ -177,34 +123,4 @@
 
     <include layout="@layout/view_default_line" />
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-
-        android:padding="@dimen/default_content_margin">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:text="备注"
-            android:textColor="@color/color_666"
-            android:textSize="@dimen/company_16sp" />
-
-        <EditText
-            android:id="@+id/edit_remark"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/student_info_leftpadding"
-            android:background="@null"
-            android:hint="请输入"
-            android:textColor="@color/color_999"
-            android:textSize="@dimen/company_16sp" />
-
-    </RelativeLayout>
-
-    <include layout="@layout/view_default_line" />
-
 </LinearLayout>