修改报名信息预览

app/src/main/AndroidManifest.xml

@@ -163,6 +163,10 @@
         <activity android:name=".activity.WebViewActivity"
             android:screenOrientation="portrait"/>
 
+        <!--我的报名预览-->
+        <activity android:name=".activity.ApplyInfoPreviewActivity"
+            android:screenOrientation="portrait"/>
+
         <!--定位服务-->
         <meta-data android:name="com.amap.api.v2.apikey" android:value="45fb5d8b52ba4f9f214bfb4fdaf81a72"/>
         <service android:name="com.amap.api.location.APSService"/>

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

@@ -0,0 +1,283 @@
+package com.ynstkz.shitu.android.activity;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import com.common.library.okhttp.callback.Callback;
+import com.google.gson.Gson;
+import com.ynstkz.shitu.android.R;
+import com.ynstkz.shitu.android.adapter.ApplyInfoPreviewPhotoAdapter;
+import com.ynstkz.shitu.android.application.STSign;
+import com.ynstkz.shitu.android.base.BaseActivity;
+import com.ynstkz.shitu.android.bean.ApplyInfoPreviewBean;
+import com.ynstkz.shitu.android.bean.LocalCityBean;
+import com.ynstkz.shitu.android.data.RequestGroup;
+import com.ynstkz.shitu.android.view.ScrollViewWithGridView;
+
+import java.util.List;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import okhttp3.Call;
+import okhttp3.Response;
+
+/**
+ * 作者：fuchangle on 2018/4/29 17:01
+ */
+
+public class ApplyInfoPreviewActivity extends BaseActivity {
+
+    @Bind(R.id.tv_title)
+    TextView tvTitle;
+    @Bind(R.id.view_title)
+    RelativeLayout viewTitle;
+    @Bind(R.id.edit_username)
+    EditText editUsername;
+    @Bind(R.id.tv_birthday)
+    TextView tvBirthday;
+    @Bind(R.id.tv_sex)
+    TextView tvSex;
+    @Bind(R.id.edit_nation)
+    EditText editNation;
+    @Bind(R.id.edit_native_place)
+    EditText editNativePlace;
+    @Bind(R.id.tv_residenceCityId)
+    TextView tvResidenceCityId;
+    @Bind(R.id.tv_residenceRegionId)
+    TextView tvResidenceRegionId;
+    @Bind(R.id.edit_residenceType)
+    EditText editResidenceType;
+    @Bind(R.id.edit_height)
+    EditText editHeight;
+    @Bind(R.id.edit_weight)
+    EditText editWeight;
+    @Bind(R.id.edit_bloodType)
+    EditText editBloodType;
+    @Bind(R.id.edit_physicalExamination)
+    EditText editPhysicalExamination;
+    @Bind(R.id.edit_idcode)
+    EditText editIdcode;
+    @Bind(R.id.tv_livingProvinceId)
+    TextView tvLivingProvinceId;
+    @Bind(R.id.tv_livingCityId)
+    TextView tvLivingCityId;
+    @Bind(R.id.tv_livingRegionId)
+    TextView tvLivingRegionId;
+    @Bind(R.id.edit_livingAddress)
+    EditText editLivingAddress;
+    @Bind(R.id.textView)
+    TextView textView;
+    @Bind(R.id.edit_contactAddress)
+    EditText editContactAddress;
+    @Bind(R.id.edit_zipCode)
+    EditText editZipCode;
+    @Bind(R.id.edit_preSchoolEducation)
+    EditText editPreSchoolEducation;
+    @Bind(R.id.edit_hobby)
+    EditText editHobby;
+    @Bind(R.id.ll_member_family)
+    LinearLayout llMemberFamily;
+    @Bind(R.id.gv_images)
+    ScrollViewWithGridView gvImages;
+    @Bind(R.id.btn_save)
+    Button btnSave;
+    @Bind(R.id.tv_ProvinceId)
+    TextView tvProvinceId;
+    @Bind(R.id.edit_residenceAddress)
+    EditText editResidenceAddress;
+    @Bind(R.id.sv_main)
+    ScrollView svMain;
+
+    private int applyId;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_applyinfo_preview);
+        ButterKnife.bind(this);
+        initView();
+        initData();
+        setListener();
+    }
+
+    private void initView() {
+        tvTitle.setText("报名信息预览");
+    }
+
+
+    private void initData() {
+        applyId = getIntent().getIntExtra("applyId", 0);
+        applyPreview(applyId + "");
+    }
+
+    private void setListener() {
+
+    }
+
+    /**
+     * 报名信息预览
+     *
+     * @param applyId
+     */
+    private void applyPreview(final String applyId) {
+
+        RequestGroup.applyPreview(applyId, new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return new Gson().fromJson(response.body().string(), ApplyInfoPreviewBean.class);
+            }
+
+            @Override
+            public void onError(Call call, Exception e, int id) {
+                STSign.getInstance().tonkenError(ApplyInfoPreviewActivity.this, e);
+            }
+
+            @Override
+            public void onResponse(Object response, int id) {
+                ApplyInfoPreviewBean applyInfoPreviewBean = (ApplyInfoPreviewBean) response;
+                if (applyInfoPreviewBean != null) {
+                    if ("200".equals(applyInfoPreviewBean.getCode())) {
+                        if (applyInfoPreviewBean.getData() != null) {
+                            ApplyInfoPreviewBean.DataBean.StudentInfoBean studentInfoBean = applyInfoPreviewBean.getData().getStudentInfo();
+                            List<ApplyInfoPreviewBean.DataBean.FamilyInfoBean> familyInfoBeans = applyInfoPreviewBean.getData().getFamilyInfo();
+                            List<ApplyInfoPreviewBean.DataBean.ApplyPhotoBean> applyPhotoBeans = applyInfoPreviewBean.getData().getApplyPhoto();
+
+                            initStudentInfo(studentInfoBean);
+                            if (familyInfoBeans != null && familyInfoBeans.size() > 0) {
+                                initFamilyInfo(familyInfoBeans);
+                            }
+                            if (applyPhotoBeans != null && applyPhotoBeans.size() > 0) {
+                                initPhotoInfo(applyPhotoBeans);
+                            }
+                        }
+                    } else {
+                        showToast(applyInfoPreviewBean.getMsg());
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     * 初始化学生信息
+     *
+     * @param studentInfoBean
+     */
+    private void initStudentInfo(ApplyInfoPreviewBean.DataBean.StudentInfoBean studentInfoBean) {
+        if (studentInfoBean == null) {
+            return;
+        }
+        editUsername.setText(studentInfoBean.getStudentName());
+        tvBirthday.setText(studentInfoBean.getBirthday());
+        tvSex.setText(getResources().getStringArray(R.array.choose_sex)[studentInfoBean.getSex()]);
+        editNation.setText(studentInfoBean.getEthnic());
+        editNativePlace.setText(studentInfoBean.getNativePlace());
+        searchCityById("", studentInfoBean.getResidenceProvinceId() + "", tvProvinceId);
+        searchCityById(studentInfoBean.getResidenceProvinceId() + "", studentInfoBean.getResidenceCityId() + "", tvResidenceCityId);
+        searchCityById(studentInfoBean.getResidenceCityId() + "", studentInfoBean.getResidenceRegionId() + "", tvResidenceRegionId);
+        editResidenceAddress.setText(studentInfoBean.getResidenceAddress());
+        editResidenceType.setText(studentInfoBean.getResidenceType() == 1 ? "城镇" : "农村");
+        editHeight.setText(studentInfoBean.getHeight());
+        editWeight.setText(studentInfoBean.getWeight());
+        editBloodType.setText(studentInfoBean.getBloodType());
+        editPhysicalExamination.setText(studentInfoBean.getPhysicalExamination() == 0 ? "不合格" : "合格");
+        editIdcode.setText(studentInfoBean.getIdCardNum());
+
+        searchCityById("", studentInfoBean.getLivingProvinceId() + "", tvLivingProvinceId);
+        searchCityById(studentInfoBean.getLivingProvinceId() + "", studentInfoBean.getLivingCityId() + "", tvLivingCityId);
+        searchCityById(studentInfoBean.getLivingCityId() + "", studentInfoBean.getLivingRegionId() + "", tvLivingRegionId);
+        editLivingAddress.setText(studentInfoBean.getLivingAddress());
+        editZipCode.setText(studentInfoBean.getZipCode());
+        editPreSchoolEducation.setText(studentInfoBean.getPreSchoolEducation());
+        editHobby.setText(studentInfoBean.getHobby());
+    }
+
+    private void initFamilyInfo(List<ApplyInfoPreviewBean.DataBean.FamilyInfoBean> familyInfoBeans) {
+        if (familyInfoBeans == null || familyInfoBeans.size() == 0) {
+            return;
+        }
+        llMemberFamily.removeAllViews();
+        for (int i = 0; i < familyInfoBeans.size(); i++) {
+
+            final ApplyInfoPreviewBean.DataBean.FamilyInfoBean familyListItem = familyInfoBeans.get(i);
+            View familyView = LayoutInflater.from(this).inflate(R.layout.item_apply_review_family, null);
+
+            ((TextView) familyView.findViewById(R.id.edit_relation)).setText(familyListItem.getRelationShip());
+            ((TextView) familyView.findViewById(R.id.tv_familyName)).setText(familyListItem.getFamilyName());
+            ((TextView) familyView.findViewById(R.id.edit_familyPhone)).setText(familyListItem.getFamilyPhone());
+            llMemberFamily.addView(familyView);
+
+        }
+        refreshFamilyLab();
+    }
+
+    private void refreshFamilyLab() {
+        if (llMemberFamily.getChildCount() > 0) {
+            for (int i = 0; i < llMemberFamily.getChildCount(); i++) {
+                LinearLayout viewMemberFamilyItem = (LinearLayout) llMemberFamily.getChildAt(i);
+                TextView tvFamilyLab = viewMemberFamilyItem.findViewById(R.id.tv_family_lab);
+                tvFamilyLab.setText("家庭成员" + (i + 1));
+            }
+        }
+    }
+
+    private void initPhotoInfo(List<ApplyInfoPreviewBean.DataBean.ApplyPhotoBean> applyPhotoBeans) {
+        if (applyPhotoBeans == null || applyPhotoBeans.size() == 0) {
+            return;
+        }
+        ApplyInfoPreviewPhotoAdapter applyInfoPreviewPhotoAdapter = new ApplyInfoPreviewPhotoAdapter(ApplyInfoPreviewActivity.this, applyPhotoBeans);
+        gvImages.setAdapter(applyInfoPreviewPhotoAdapter);
+        applyInfoPreviewPhotoAdapter.notifyDataSetChanged();
+        svMain.smoothScrollTo(0,0);
+    }
+
+    /**
+     * 搜索城市根据ID
+     *
+     * @param parentId
+     */
+    private void searchCityById(String parentId, final String locationId, final TextView textView) {
+        RequestGroup.getLocalCity(parentId, new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return new Gson().fromJson(response.body().string(), LocalCityBean.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) {
+                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 (regionId.equals(locationId)) {
+                                        textView.setText(dataBean.get(i).getRegionName());
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        showToast(localCityBean.getMsg());
+                    }
+                }
+            }
+        });
+
+    }
+}

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

@@ -3,6 +3,7 @@ package com.ynstkz.shitu.android.activity;
 import android.Manifest;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
@@ -21,10 +22,16 @@ import com.amap.api.location.AMapLocationClient;
 import com.amap.api.location.AMapLocationClientOption;
 import com.amap.api.location.AMapLocationListener;
 import com.common.library.cache.Cache;
+import com.common.library.okhttp.callback.Callback;
+import com.common.library.utils.AppInfoUtil;
+import com.common.library.view.materialdialog.MaterialDialog;
+import com.google.gson.Gson;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
+import com.ynstkz.shitu.android.bean.AppVersionBean;
 import com.ynstkz.shitu.android.bean.LocationDataBean;
 import com.ynstkz.shitu.android.common.Constants;
+import com.ynstkz.shitu.android.data.RequestGroup;
 import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
 import com.ynstkz.shitu.android.event.LocationChangedEvent;
 import com.ynstkz.shitu.android.event.LogoutEvent;
@@ -37,30 +44,34 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.util.List;
+
 import butterknife.Bind;
+import okhttp3.Call;
+import okhttp3.Response;
 
 /**
- *　　　　　　　 ┏┓       ┏┓+ +
- *　　　　　　　┏┛┻━━━━━━━┛┻┓ + +
- *　　　　　　　┃　　　　　　 ┃
- *　　　　　　　┃　　　━　　　┃ ++ + + +
- *　　　　　　 █████━█████  ┃+
- *　　　　　　　┃　　　　　　 ┃ +
- *　　　　　　　┃　　　┻　　　┃
- *　　　　　　　┃　　　　　　 ┃ + +
- *　　　　　　　┗━━┓　　　 ┏━┛
- *               ┃　　  ┃
- *　　　　　　　　　┃　　  ┃ + + + +
- *　　　　　　　　　┃　　　┃　Code is far away from     bug with the animal protecting
- *　　　　　　　　　┃　　　┃ + 　　　　         神兽保佑,代码无bug
- *　　　　　　　　　┃　　　┃
- *　　　　　　　　　┃　　　┃　　+
- *　　　　　　　　　┃　 　 ┗━━━┓ + +
- *　　　　　　　　　┃ 　　　　　┣┓
- *　　　　　　　　　┃ 　　　　　┏┛
- *　　　　　　　　　┗┓┓┏━━━┳┓┏┛ + + + +
- *　　　　　　　　　 ┃┫┫　 ┃┫┫
- *　　　　　　　　　 ┗┻┛　 ┗┻┛+ + + +
+ * 　　　　　　　 ┏┓       ┏┓+ +
+ * 　　　　　　　┏┛┻━━━━━━━┛┻┓ + +
+ * 　　　　　　　┃　　　　　　 ┃
+ * 　　　　　　　┃　　　━　　　┃ ++ + + +
+ * 　　　　　　 █████━█████  ┃+
+ * 　　　　　　　┃　　　　　　 ┃ +
+ * 　　　　　　　┃　　　┻　　　┃
+ * 　　　　　　　┃　　　　　　 ┃ + +
+ * 　　　　　　　┗━━┓　　　 ┏━┛
+ * ┃　　  ┃
+ * 　　　　　　　　　┃　　  ┃ + + + +
+ * 　　　　　　　　　┃　　　┃　Code is far away from     bug with the animal protecting
+ * 　　　　　　　　　┃　　　┃ + 　　　　         神兽保佑,代码无bug
+ * 　　　　　　　　　┃　　　┃
+ * 　　　　　　　　　┃　　　┃　　+
+ * 　　　　　　　　　┃　 　 ┗━━━┓ + +
+ * 　　　　　　　　　┃ 　　　　　┣┓
+ * 　　　　　　　　　┃ 　　　　　┏┛
+ * 　　　　　　　　　┗┓┓┏━━━┳┓┏┛ + + + +
+ * 　　　　　　　　　 ┃┫┫　 ┃┫┫
+ * 　　　　　　　　　 ┗┻┛　 ┗┻┛+ + + +
  */
 
 public class HomeActivity extends TitleBarActivity implements AMapLocationListener {
@@ -138,6 +149,8 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
         mLocationOption.setNeedAddress(true);
         //设置定位参数
         mlocationClient.setLocationOption(mLocationOption);
+        //获取新版本
+        getUpdateApp();
     }
 
     private void setListener() {
@@ -206,9 +219,9 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
     public void onLocationChanged(AMapLocation amapLocation) {
         if (amapLocation != null) {
             if (amapLocation.getErrorCode() == 0) {
-                if(!isLocationSuccess){
+                if (!isLocationSuccess) {
                     LocationDataBean locationDataBean = new LocationDataBean();
-                    if(amapLocation.getProvince().indexOf("云南") > 0) {
+                    if (amapLocation.getProvince().indexOf("云南") > 0) {
                         locationDataBean.setCity(amapLocation.getDistrict());
                         locationDataBean.setLatitude(amapLocation.getLatitude());
                         locationDataBean.setLongitude(amapLocation.getLongitude());
@@ -234,10 +247,10 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
     @Override
     protected void onResume() {
         super.onResume();
-        if(!isLocationSuccess) {
+        if (!isLocationSuccess) {
             Cache<LocationDataBean> cacheLocation = new Cache<>();
             LocationDataBean locationDataBean = cacheLocation.get("locationDataBean");
-            if(locationDataBean != null) {
+            if (locationDataBean != null) {
                 EventBus.getDefault().post(new LocationChangedEvent(locationDataBean));
                 isLocationSuccess = true;
             }
@@ -251,10 +264,10 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
     /**
      * 获取权限
      */
-    private void requestPermission(){
-        if(Build.VERSION.SDK_INT>=23){
-            String[] mPermissionList = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,Manifest.permission.ACCESS_FINE_LOCATION,Manifest.permission.CALL_PHONE,Manifest.permission.READ_LOGS,Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE,Manifest.permission.SET_DEBUG_APP,Manifest.permission.SYSTEM_ALERT_WINDOW,Manifest.permission.GET_ACCOUNTS,Manifest.permission.WRITE_APN_SETTINGS};
-            ActivityCompat.requestPermissions(this,mPermissionList,123);
+    private void requestPermission() {
+        if (Build.VERSION.SDK_INT >= 23) {
+            String[] mPermissionList = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CALL_PHONE, Manifest.permission.READ_LOGS, Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.SET_DEBUG_APP, Manifest.permission.SYSTEM_ALERT_WINDOW, Manifest.permission.GET_ACCOUNTS, Manifest.permission.WRITE_APN_SETTINGS};
+            ActivityCompat.requestPermissions(this, mPermissionList, 123);
         }
     }
 
@@ -273,6 +286,78 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
         }
     }
 
+    /**
+     * 获取新版本
+     */
+    private void getUpdateApp() {
+
+        RequestGroup.getAppVersion(new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return new Gson().fromJson(response.body().string(), AppVersionBean.class);
+            }
+
+            @Override
+            public void onError(Call call, Exception e, int id) {
+
+            }
+
+            @Override
+            public void onResponse(Object response, int id) {
+                AppVersionBean appVersionBean = (AppVersionBean) response;
+                if (appVersionBean != null) {
+                    if ("200".equals(appVersionBean.getCode())) {
+                        List<AppVersionBean.DataBean> dataBeans = appVersionBean.getData();
+                        if (dataBeans != null && dataBeans.size() > 0) {
+                            for (int i = 0; i < dataBeans.size(); i++) {
+                                final AppVersionBean.DataBean dataBean = dataBeans.get(i);
+                                String appType = dataBean.getAppType();
+                                if ("ANDROID".equals(appType) && dataBean.getStatus() == 2) {
+                                    try {
+                                        int versionCode = Integer.parseInt(dataBean.getVersion());
+                                        int currentCode = AppInfoUtil.getVersionCode(HomeActivity.this);
+                                        if (versionCode > currentCode) {
+                                            final MaterialDialog dialog = new MaterialDialog(HomeActivity.this);
+                                            dialog.setTitle(dataBean.getTitle());
+                                            dialog.setMessage(dataBean.getContent());
+                                            dialog.setPositiveButton("确定", new View.OnClickListener() {
+                                                @Override
+                                                public void onClick(View view) {
+                                                    String appUrl = dataBean.getAppUrl();
+                                                    Intent intent = new Intent();
+                                                    intent.setAction("android.intent.action.VIEW");
+                                                    Uri content_url = Uri.parse(appUrl);
+                                                    intent.setData(content_url);
+                                                    startActivity(intent);
+                                                    if(dataBean.getMustUpdate() != 1) {
+                                                        dialog.dismiss();
+                                                    }
+                                                }
+                                            });
+                                            dialog.setNegativeButton("取消", new View.OnClickListener() {
+                                                @Override
+                                                public void onClick(View view) {
+                                                    if(dataBean.getMustUpdate() == 1) {
+                                                        System.exit(0);
+                                                    } else {
+                                                        dialog.dismiss();
+                                                    }
+                                                }
+                                            });
+                                            dialog.show();
+                                        }
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        });
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMessageEvent(RegisterSuccessEvent event) {
         changleLayout(0);
@@ -285,8 +370,8 @@ public class HomeActivity extends TitleBarActivity implements AMapLocationListen
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if(mFragments[tabIndex] instanceof OrgListFragment){
-            if(((OrgListFragment)mFragments[tabIndex]).onKeyDown(keyCode, event)){
+        if (mFragments[tabIndex] instanceof OrgListFragment) {
+            if (((OrgListFragment) mFragments[tabIndex]).onKeyDown(keyCode, event)) {
                 return true;
             }
         }

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

@@ -9,20 +9,17 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.common.library.cache.Cache;
 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.IdAuthCacheBean;
+import com.ynstkz.shitu.android.bean.UserInfoBean;
 import com.ynstkz.shitu.android.data.RequestGroup;
-import com.ynstkz.shitu.android.data.SharedPreferencesUtils;
 
 import butterknife.Bind;
 import okhttp3.Call;
@@ -53,7 +50,6 @@ public class IdAuthActivity extends TitleBarActivity {
     @Bind(R.id.btn_submit)
     Button btnSubmit;
 
-    private String CACHE_KEY = "cache_key";
     private ProgressDialog progressDialog;
 
     @Override
@@ -74,19 +70,15 @@ public class IdAuthActivity extends TitleBarActivity {
     }
 
     private void initData(){
-        Cache<IdAuthCacheBean> cache = new Cache();
-        IdAuthCacheBean idAuthCacheBean = cache.get(CACHE_KEY);
-        if(idAuthCacheBean != null && idAuthCacheBean.getUserId().equals(SharedPreferencesUtils.getUserId())){
-            if(idAuthCacheBean.isPatriarch().equals("1")) {
+        UserInfoBean userInfoBean = STSign.getInstance().getUserInfo();
+        if(userInfoBean != null && userInfoBean.getData() != null) {
+            UserInfoBean.DataBean dataBean = userInfoBean.getData();
+            if(dataBean.getIsParent() == 1) {
                 sbPatriarch.setChecked(true);
-            } else {
-                sbPatriarch.setChecked(false);
-            }
-            editUsername.setText(idAuthCacheBean.getUserName());
-            editIdcard.setText(idAuthCacheBean.getIdCard());
-            if(idAuthCacheBean.isAgree()) {
-                cbAgree.setChecked(true);
             }
+            editUsername.setText(dataBean.getRealName());
+            editIdcard.setText(dataBean.getIdCardNum());
+            cbAgree.setChecked(true);
         }
     }
 
@@ -152,13 +144,6 @@ public class IdAuthActivity extends TitleBarActivity {
                 if(baseBean != null){
                     showToast(baseBean.getMsg());
                     if("200".equals(baseBean.getCode())){
-                        IdAuthCacheBean idAuthCacheBean = new IdAuthCacheBean();
-                        idAuthCacheBean.setUserId(SharedPreferencesUtils.getUserId());
-                        idAuthCacheBean.setPatriarch(isParent);
-                        idAuthCacheBean.setUserName(realName);
-                        idAuthCacheBean.setIdCard(idCardNum);
-                        idAuthCacheBean.setAgree(true);
-                        com.common.library.cache.Cache.put(CACHE_KEY, idAuthCacheBean);
                         finish();
                     }
                 }

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

@@ -66,8 +66,6 @@ public class StudentInfoActivity extends TitleBarActivity {
     TextView tvResidenceRegionId;
     @Bind(R.id.ll_member_family)
     LinearLayout llMemberFamily;
-    @Bind(R.id.gv_images)
-    ScrollViewWithGridView gvImages;
     @Bind(R.id.btn_save)
     Button btnSave;
     @Bind(R.id.tv_ProvinceId)

app/src/main/java/com/ynstkz/shitu/android/adapter/ApplyInfoPreviewPhotoAdapter.java

@@ -0,0 +1,66 @@
+package com.ynstkz.shitu.android.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.common.library.adapter.CCAdapterHolder;
+import com.common.library.adapter.CCListAdapter;
+import com.ynstkz.shitu.android.R;
+import com.ynstkz.shitu.android.bean.ApplyInfoPreviewBean;
+import com.ynstkz.shitu.android.data.UrlCat;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 作者：fuchangle on 2018/4/30 15:31
+ */
+
+public class ApplyInfoPreviewPhotoAdapter extends CCListAdapter<ApplyInfoPreviewBean.DataBean.ApplyPhotoBean>{
+
+    private Context context;
+    private Map<String, String> photoLabs;
+
+    public ApplyInfoPreviewPhotoAdapter(Context context, List<ApplyInfoPreviewBean.DataBean.ApplyPhotoBean> adapterContent) {
+        super(context, adapterContent);
+        this.context = context;
+
+        photoLabs = new HashMap<>();
+        photoLabs.put("type1", "户口本首页");
+        photoLabs.put("type2", "户口本户主页");
+        photoLabs.put("type3", "户口本学生页");
+        photoLabs.put("type4", "房产证");
+        photoLabs.put("type5", "证件照");
+        photoLabs.put("type6", "其他证明资料");
+    }
+
+    @Override
+    public CCAdapterHolder<ApplyInfoPreviewBean.DataBean.ApplyPhotoBean> createHolder(int type) {
+        return new CCAdapterHolder<ApplyInfoPreviewBean.DataBean.ApplyPhotoBean>() {
+
+            TextView tvLab;
+            ImageView ivPhoto;
+
+            @Override
+            public int getResource() {
+                return R.layout.item_applyinfo_photo;
+            }
+
+            @Override
+            public void initializeView(View convertView) {
+                tvLab = convertView.findViewById(R.id.tv_lab);
+                ivPhoto = convertView.findViewById(R.id.iv_photo);
+            }
+
+            @Override
+            public void updateView(ApplyInfoPreviewBean.DataBean.ApplyPhotoBean content, int position) {
+                tvLab.setText(photoLabs.get(content.getPhotosType()));
+                Glide.with(context).load(UrlCat.HOST + content.getPhotosUrl()).into(ivPhoto);
+            }
+        };
+    }
+}

app/src/main/java/com/ynstkz/shitu/android/adapter/MineSignUpAdapter.java

@@ -1,6 +1,7 @@
 package com.ynstkz.shitu.android.adapter;
 
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.Paint;
 import android.text.TextUtils;
 import android.view.View;
@@ -11,6 +12,7 @@ import com.bumptech.glide.Glide;
 import com.common.library.adapter.CCAdapterHolder;
 import com.common.library.adapter.CCListAdapter;
 import com.ynstkz.shitu.android.R;
+import com.ynstkz.shitu.android.activity.ApplyInfoPreviewActivity;
 import com.ynstkz.shitu.android.bean.SignUpRecorsBean;
 import com.ynstkz.shitu.android.data.UrlCat;
 
@@ -39,7 +41,7 @@ public class MineSignUpAdapter extends CCListAdapter<SignUpRecorsBean>{
             TextView tvRegaddress;
             TextView tvCoursePrice;
             TextView tvCourseMarketprice;
-
+            TextView tvPreview;
 
             @Override
             public int getResource() {
@@ -54,10 +56,11 @@ public class MineSignUpAdapter extends CCListAdapter<SignUpRecorsBean>{
                 tvRegaddress = convertView.findViewById(R.id.tv_regaddress);
                 tvCoursePrice = convertView.findViewById(R.id.tv_course_price);
                 tvCourseMarketprice = convertView.findViewById(R.id.tv_course_marketprice);
+                tvPreview = convertView.findViewById(R.id.tv_preview);
             }
 
             @Override
-            public void updateView(SignUpRecorsBean content, int position) {
+            public void updateView(final SignUpRecorsBean content, int position) {
                 if(!TextUtils.isEmpty(content.getCoursePic())) {
                     if(content.getCoursePic().startsWith("http")) {
                         Glide.with(context).load(content.getCoursePic()).into(ivHeadPic);
@@ -73,6 +76,14 @@ public class MineSignUpAdapter extends CCListAdapter<SignUpRecorsBean>{
                 tvCoursePrice.setText("￥" + content.getPrice());
                 tvCourseMarketprice.setText(content.getMarketPrice() + "");
                 tvCourseMarketprice.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG);
+                tvPreview.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        Intent intent = new Intent(context, ApplyInfoPreviewActivity.class);
+                        intent.putExtra("applyId", content.getApplyId());
+                        context.startActivity(intent);
+                    }
+                });
             }
         };
     }

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

@@ -0,0 +1,151 @@
+package com.ynstkz.shitu.android.bean;
+
+import com.google.gson.annotations.SerializedName;
+import com.ynstkz.shitu.android.base.BaseBean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 作者：fuchangle on 2018/4/29 16:21
+ */
+
+public class AppVersionBean extends BaseBean{
+
+
+    private List<DataBean> data;
+
+    public List<DataBean> getData() {
+        return data;
+    }
+
+    public void setData(List<DataBean> data) {
+        this.data = data;
+    }
+
+    public static class DataBean implements Serializable{
+        /**
+         * id : 5
+         * title : test3
+         * version : 1.2
+         * content : 11111111
+         * mustUpdate : 0
+         * appUrl : http://www.baidu.com
+         * appType : IOS
+         * oprator : admin
+         * status : 2
+         * createTime : 1524635969000
+         * updateTime : 1524712163000
+         * isDelete : 0
+         */
+
+        private int id;
+        private String title;
+        private String version;
+        private String content;
+        private int mustUpdate;
+        private String appUrl;
+        private String appType;
+        private String oprator;
+        private int status;
+        private long createTime;
+        private long updateTime;
+        private int isDelete;
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public String getVersion() {
+            return version;
+        }
+
+        public void setVersion(String version) {
+            this.version = version;
+        }
+
+        public String getContent() {
+            return content;
+        }
+
+        public void setContent(String content) {
+            this.content = content;
+        }
+
+        public int getMustUpdate() {
+            return mustUpdate;
+        }
+
+        public void setMustUpdate(int mustUpdate) {
+            this.mustUpdate = mustUpdate;
+        }
+
+        public String getAppUrl() {
+            return appUrl;
+        }
+
+        public void setAppUrl(String appUrl) {
+            this.appUrl = appUrl;
+        }
+
+        public String getAppType() {
+            return appType;
+        }
+
+        public void setAppType(String appType) {
+            this.appType = appType;
+        }
+
+        public String getOprator() {
+            return oprator;
+        }
+
+        public void setOprator(String oprator) {
+            this.oprator = oprator;
+        }
+
+        public int getStatus() {
+            return status;
+        }
+
+        public void setStatus(int status) {
+            this.status = status;
+        }
+
+        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/IdAuthCacheBean.java

@@ -1,56 +0,0 @@
-package com.ynstkz.shitu.android.bean;
-
-import java.io.Serializable;
-
-/**
- * 作者：fuchangle on 2018/4/21 22:22
- */
-
-public class IdAuthCacheBean implements Serializable{
-
-    private String userId;
-    private String isPatriarch;
-    private String userName;
-    private String idCard;
-    private boolean isAgree;
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public void setUserId(String userId) {
-        this.userId = userId;
-    }
-
-    public String isPatriarch() {
-        return isPatriarch;
-    }
-
-    public void setPatriarch(String patriarch) {
-        isPatriarch = patriarch;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getIdCard() {
-        return idCard;
-    }
-
-    public void setIdCard(String idCard) {
-        this.idCard = idCard;
-    }
-
-    public boolean isAgree() {
-        return isAgree;
-    }
-
-    public void setAgree(boolean agree) {
-        isAgree = agree;
-    }
-}

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

@@ -14,6 +14,7 @@ public class UserInfoBean extends BaseBean{
 
     private DataBean data;
 
+
     public DataBean getData() {
         return data;
     }
@@ -22,7 +23,23 @@ public class UserInfoBean extends BaseBean{
         this.data = data;
     }
 
-    public static class DataBean implements Serializable{
+    public static class DataBean implements Serializable {
+        /**
+         * userId : 74
+         * userName : a123456789
+         * userPwd :
+         * headPic : /upload/headPic/74/2018-04-27/wfo8yl3wjkhy7s8y40tug1npywqvfnqe.jpg
+         * mobile : 18536258888
+         * isParent : 1
+         * realName : zhen
+         * idCardNum : 110563199608523652
+         * regTime : 1524634605000
+         * createTime : 1524634605000
+         * updateTime : 1524809687000
+         * isDelete : 0
+         * months : null
+         * count : null
+         */
 
         private int userId;
         private String userName;

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

@@ -508,4 +508,16 @@ public class RequestGroup {
         OkHttpUtils.postString().url(UrlCat.URL_USER_RESET_MOBILE).addHeader(KEY_TOKEN,
                 SharedPreferencesUtils.getToken()).content(new Gson().toJson(params)).build().execute(callback);
     }
+
+    /**
+     * 报名预览
+     * @param applyId
+     * @param callback
+     */
+    public static void applyPreview(String applyId, Callback callback){
+        Map<String, String> params = getSystemParams();
+        params.put("applyId", applyId);
+        OkHttpUtils.get().url(UrlCat.URL_APPLY_PREVIEW).addHeader(KEY_TOKEN,
+                SharedPreferencesUtils.getToken()).params(params).build().execute(callback);
+    }
 }

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

@@ -207,6 +207,11 @@ public class UrlCat {
      * 删除家长信息
      */
     public static final String URL_DELETE_FAMILY = HOST + "api/user/family/delete";
+
+    /**
+     * 报名预览
+     */
+    public static final String URL_APPLY_PREVIEW = HOST + "api/apply/preview";
 }
 
 

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

@@ -0,0 +1,634 @@
+<?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:orientation="vertical">
+
+    <include layout="@layout/view_title"/>
+
+    <ScrollView
+        android:id="@id/sv_main"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <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_username"
+                    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:focusable="false"
+                    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" />
+
+                <TextView
+                    android:id="@+id/tv_birthday"
+                    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: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" />
+
+                <TextView
+                    android:id="@+id/tv_sex"
+                    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: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:id="@+id/edit_nation"
+                    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:focusable="false"
+                    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:id="@+id/edit_native_place"
+                    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:focusable="false"
+                    android:textColor="@color/color_999"
+                    android:textSize="@dimen/company_16sp" />
+
+            </RelativeLayout>
+
+            <include layout="@layout/view_default_line" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    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" />
+
+                    <LinearLayout
+                        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" />
+
+                        <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>
+
+                <EditText
+                    android:id="@+id/edit_residenceAddress"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="100dp"
+                    android:background="@null"
+                    android:focusable="false"
+                    android:textColor="@color/color_999"
+                    android:textSize="@dimen/company_16sp" />
+
+            </LinearLayout>
+
+            <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_residenceType"
+                    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:focusable="false"
+                    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:id="@+id/edit_height"
+                    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:focusable="false"
+                    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:id="@+id/edit_weight"
+                    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:focusable="false"
+                    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:id="@+id/edit_bloodType"
+                    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:focusable="false"
+                    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:id="@+id/edit_physicalExamination"
+                    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:focusable="false"
+                    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:id="@+id/edit_idcode"
+                    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:focusable="false"
+                    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" />
+
+                <LinearLayout
+                    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_livingProvinceId"
+                        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_livingCityId"
+                        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_livingRegionId"
+                        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>
+
+            <EditText
+                android:id="@+id/edit_livingAddress"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="100dp"
+                android:background="@null"
+                android:focusable="false"
+                android:textColor="@color/color_999"
+                android:textSize="@dimen/company_16sp" />
+
+            <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"
+                    android:id="@+id/textView" />
+
+                <EditText
+                    android:id="@+id/edit_contactAddress"
+                    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:focusable="false"
+                    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:id="@+id/edit_zipCode"
+                    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:focusable="false"
+                    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:id="@+id/edit_preSchoolEducation"
+                    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:focusable="false"
+                    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:id="@+id/edit_hobby"
+                    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:focusable="false"
+                    android:textColor="@color/color_999"
+                    android:textSize="@dimen/company_16sp" />
+
+            </RelativeLayout>
+
+            <include layout="@layout/view_default_line" />
+
+            <LinearLayout
+                android:id="@+id/ll_member_family"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+            </LinearLayout>
+
+            <com.ynstkz.shitu.android.view.ScrollViewWithGridView
+                android:id="@+id/gv_images"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:verticalSpacing="@dimen/company_10dp"
+                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_marginLeft="@dimen/default_content_margin"
+                android:layout_marginRight="@dimen/default_content_margin"
+                android:background="@drawable/shape_default_btn_bg"
+                android:textColor="@color/white"
+                android:textSize="@dimen/company_16sp"
+                android:text="保存"
+                android:visibility="gone"/>
+
+        </LinearLayout>
+
+    </ScrollView>
+
+</LinearLayout>

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

@@ -217,12 +217,6 @@
 
             </LinearLayout>
 
-            <com.ynstkz.shitu.android.view.ScrollViewWithGridView
-                android:id="@+id/gv_images"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:numColumns="2" />
-
             <Button
                 android:id="@+id/btn_save"
                 android:layout_width="match_parent"

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

@@ -0,0 +1,124 @@
+<?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: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"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/tv_family_lab"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="@dimen/default_content_margin"
+            android:paddingTop="@dimen/default_content_margin"
+            android:textSize="@dimen/company_16sp"
+            android:textStyle="bold" />
+
+        <ImageView
+            android:id="@+id/iv_family_add"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/company_20dp"
+            android:layout_gravity="bottom"
+            android:src="@drawable/family_info_add_icon"
+            android:visibility="gone"/>
+
+    </LinearLayout>
+
+    <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" />
+
+        <TextView
+            android:id="@+id/edit_relation"
+            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: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" />
+
+        <TextView
+            android:id="@+id/tv_familyName"
+            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: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" />
+
+        <TextView
+            android:id="@+id/edit_familyPhone"
+            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:inputType="phone"
+            android:textColor="@color/color_999"
+            android:textSize="@dimen/company_16sp" />
+
+    </RelativeLayout>
+
+    <include layout="@layout/view_default_line" />
+
+</LinearLayout>

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

@@ -0,0 +1,20 @@
+<?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:orientation="vertical"
+    android:gravity="center"
+    android:layout_gravity="center">
+
+    <TextView
+        android:id="@+id/tv_lab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <ImageView
+        android:id="@+id/iv_photo"
+        android:layout_width="@dimen/company_100dp"
+        android:layout_height="@dimen/company_100dp"
+        android:scaleType="centerCrop"/>
+
+</LinearLayout>

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

@@ -22,16 +22,33 @@
             android:layout_marginLeft="@dimen/company_10dp"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/tv_memberName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:maxLines="1"
-                android:ellipsize="end"
-                android:textSize="@dimen/company_16sp"
-                android:textColor="@color/color_333"
-                android:textStyle="bold"
-                android:text="新东方培训学校-西湖文化广场分校"/>
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/tv_memberName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                    android:layout_alignParentLeft="true"
+                    android:layout_toLeftOf="@+id/tv_preview"
+                    android:textSize="@dimen/company_16sp"
+                    android:textColor="@color/color_333"
+                    android:textStyle="bold"
+                    android:text="新东方培训学校-西湖文化广场分校"/>
+
+                <TextView
+                    android:id="@+id/tv_preview"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:textSize="@dimen/company_16sp"
+                    android:textColor="@color/main_color"
+                    android:text="报名信息预览"/>
+
+            </RelativeLayout>
 
             <RelativeLayout
                 android:layout_width="match_parent"