diff --git a/PersonalCenter/.idea/misc.xml b/PersonalCenter/.idea/misc.xml
index fbb6828..5d19981 100644
--- a/PersonalCenter/.idea/misc.xml
+++ b/PersonalCenter/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
index be66109..eff9cbf 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
@@ -42,6 +42,7 @@ import com.hjx.personalcenter.model.SignInfo;
 import com.hjx.personalcenter.model.VideoInfo;
 import com.hjx.personalcenter.update.UpdateChecker;
 import com.hjx.personalcenter.util.AlertUtils;
+import com.hjx.personalcenter.util.BrithdayStar;
 import com.hjx.personalcenter.util.CropUtils;
 import com.hjx.personalcenter.util.DialogPermission;
 import com.hjx.personalcenter.util.FileUtil;
@@ -110,6 +111,22 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
                         iv_sex.setImageResource(R.mipmap.women);
                     }
                     mSimpleDraweeView.setImageURI(cardinfoBean.getPortrait());
+                    //加载星座
+                    BrithdayStar brithdayStar = new BrithdayStar();
+                    if (cardinfoBean.getBirthday() ==null||"".equals(cardinfoBean.getBirthday())) {
+                        tv_mygad.setText("");
+                    } else {
+                        String xiongzuo = brithdayStar.getConstellations(cardinfoBean.getBirthday());
+                        tv_mygad.setText(xiongzuo);
+                    }
+                    //保存个人信息
+                    SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTUSERNAME,cardinfoBean.getNickName());
+                    SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTGRADES,cardinfoBean.getGrade().getGradeName());
+                    SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTSCHOOL,cardinfoBean.getSchool().getSchoolName());
+                    SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTCONSTELLATION,cardinfoBean.getBirthday());
+                    SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTSEX,tv_sex.getText().toString());
+                    SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTQQ,cardinfoBean.getQq());
+
                     String graderID = cardinfoBean.getGrade().getGradeId();
                     String userID = SaveParam.getInstance().getLoginParam(MainActivity.this, "userId");
                     //账户类型
@@ -446,13 +463,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         String userID = SaveParam.getInstance().getLoginParam(this, "userId");
         //账户类型
         String accounts = SaveParam.getInstance().getCustomizeParam(this, SaveParam.ACCOUNT);
-        //加载个人信息
-        String xiongzuo = SaveParam.getInstance().getLoginParam(this, SaveParam.CONSTELLATION);
-        if (xiongzuo == null) {
-            tv_mygad.setText("");
-        } else {
-            tv_mygad.setText(xiongzuo);
-        }
         try {
             int graderID;
             long auserID = Long.parseLong(userID);
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java
index 1b41d3e..5941634 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java
@@ -113,9 +113,16 @@ public class RegisterInfoActivity extends AppCompatActivity implements View.OnCl
                     String register6 = et_region.getText().toString().trim();
                     String register7 = et_grade.getText().toString().trim();
                     String register8 = et_school.getText().toString().trim();
+                    String grade;
                     if (Content.accountflag == 2) {
+                        String accounts = SaveParam.getInstance().getCustomizeParam(RegisterInfoActivity.this,SaveParam.ACCOUNT);
                         String userID = SaveParam.getInstance().getLoginParam(this, "userId");
-                        String grade = SaveParam.getInstance().getCustomizeParam(this, SaveParam.GRADENS);
+                        if ("2".equals(accounts)){
+                            grade = SaveParam.getInstance().getCustomizeParam(this, SaveParam.CHILDSGRADENS);
+                        }else {
+                            grade = SaveParam.getInstance().getCustomizeParam(this, SaveParam.GRADENS);
+                        }
+
                         String School = SaveParam.getInstance().getLoginParam(this, SaveParam.SCHOOOlID);
                         String regionId = SaveParam.getInstance().getsaveCityParam(this, SaveParam.COUNTRY);
                         String regionId1 = SaveParam.getInstance().getsaveCityParam(this, SaveParam.CITYS);
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java
index 1d554f9..85d07b9 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java
@@ -23,7 +23,17 @@ public class SaveParam {
 	public static String GRADES = "gadens";//年级
 	public static String SCHOOL = "school";//学校
 	public static String CONSTELLATION = "constellations";//星座
-	public static String HEADURL = "headurl";//星座
+	public static String HEADURL = "headurl";//头像
+
+	//用户个人信息
+	public static String ACCOUNTUSERNAME = "accountusernames";//昵称
+	public static String ACCOUNTADRESS = "accountadress";//地址
+	public static String ACCOUNTGRADES = "accountgadens";//年级
+	public static String ACCOUNTSCHOOL = "accountschool";//学校
+	public static String ACCOUNTCONSTELLATION = "accountbthday";//生日
+	public static String ACCOUNTSEX = "accountsex";//性别
+	public static String ACCOUNTQQ= "accountqq";//qq
+	public static String ACCOUNTXINGZUO = "accountxingzuo";//详细地址
 
 	//电子保卡信息
 	public static String CARDPHONE = "cardphone";//保卡手机号
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java
index 0ec9094..c625d8e 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java
@@ -33,7 +33,6 @@ import com.hjx.personalcenter.model.GradeInfo;
 import com.hjx.personalcenter.model.ProvinceInfo;
 import com.hjx.personalcenter.model.SchoolInfo;
 import com.hjx.personalcenter.util.AlertUtils;
-import com.hjx.personalcenter.util.BrithdayStar;
 import com.hjx.personalcenter.util.GetDevicesUtil;
 import com.mylhyl.circledialog.CircleDialog;
 import com.mylhyl.circledialog.callback.ConfigDialog;
@@ -108,6 +107,26 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
     }
 
     private void initData() {
+        //初始化个人信息
+        String name = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTUSERNAME);
+        String adress1 = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTADRESS);
+        String adress2 = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTXINGZUO);
+        String sex = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTSEX);
+        String bithday = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTCONSTELLATION);
+        String qq = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTQQ);
+        String grader = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTGRADES);
+        String school = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTSCHOOL);
+        tv_username1.setText(name);
+        tv_useinfo_qq.setText(qq);
+        tv_sex.setText(sex);
+        tv_useinfo_birthday.setText(bithday);
+        tv_useinfo_gender.setText(grader);
+        tv_useinfo_school.setText(school);
+        tv_useinfo_adress1.setText(adress2);
+        tv_useinfo_adress.setText(adress1);
+
+
+
 
     }
 
@@ -124,6 +143,7 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
         my_school.setOnClickListener(this);
         sub.setOnClickListener(this);
         tv_version.setOnClickListener(this);
+        ccancel.setOnClickListener(this);
     }
 
     @Override
@@ -216,16 +236,12 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
                     AlertUtils.showToast(getActivity(), "请将信息填写完整！");
                     return;
                 } else {
-
                     int a = 0, b = 0;
                     int d = 1;
                     Object schoolids;
                     Long f = null;
-                    //保存星座
-                    BrithdayStar brithdayStar = new BrithdayStar();
-                    String s = brithdayStar.getConstellations(tv_useinfo_birthday.getText().toString());
-                    SaveParam.getInstance().saveCustomizeParam(getActivity(), SaveParam.CONSTELLATION, s);
-
+                    SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.ACCOUNTADRESS,presonal4);
+                    SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.ACCOUNTXINGZUO,presonal2);
                     String regionId = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.COUNTRY);
                     String regionId1 = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.CITYS);
                     if (regionId == null) {
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java
index 50bc0fe..6319c7f 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java
@@ -152,6 +152,7 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem
         gridView.setOnItemClickListener(this);
         sub.setOnClickListener(this);
         tv_presons.setOnClickListener(this);
+        cances.setOnClickListener(this);
     }
 
     @Override
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java
index 609bbf7..b5a808b 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java
@@ -182,6 +182,8 @@ public class HttpManager {
 
     //修改密码
     public void changepwd(final Context context, String username, String old_pwd1, String newpassword3) {
+        mProgress = DialogPermission.showProgress(context, null, "正在修改密码...",
+                false, true, null);
         RequestParams params = new RequestParams();
         params.put(HttpKey.USERNAME, username);
         params.put(HttpKey.OLDPASS, old_pwd1);
@@ -191,6 +193,7 @@ public class HttpManager {
         HttpClient.getInstance().post(HttpUrl.changepassword, params, new AsyncHttpResponseHandler() {
             @Override
             public void onSuccess(int i, Header[] headers, byte[] bytes) {
+                closeProgress();
                 try {
                     JSONObject jsonObject = new JSONObject(new String(bytes));
                     String status = jsonObject.optString("status");
@@ -212,6 +215,7 @@ public class HttpManager {
 
             @Override
             public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
+                closeProgress();
                 Log.e("test", "onFailure" + new String(bytes));
                 AlertUtils.showToast(context, "无法链接到服务器,请检查您的网络或稍后重试!");
             }
diff --git a/PersonalCenter/app/src/main/res/layout/activity_changepsword.xml b/PersonalCenter/app/src/main/res/layout/activity_changepsword.xml
index a621659..e6c3c9c 100644
--- a/PersonalCenter/app/src/main/res/layout/activity_changepsword.xml
+++ b/PersonalCenter/app/src/main/res/layout/activity_changepsword.xml
@@ -26,7 +26,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:text="@string/string_menu_title"
+            android:text="修改密码"
             android:textColor="@android:color/white"
             android:textSize="22sp" />
     </RelativeLayout>
@@ -51,40 +51,48 @@
                 style="@style/login_register_edit_style"
                 android:hint="输入原密码"
                 android:inputType="textPassword" />
+
+        </RelativeLayout>
+
+
+        <TextView
+            android:id="@+id/oldpassword_error_hint"
+            style="@style/registererrhint_style"
+            android:layout_below="@id/pwd_rl" />
+        <RelativeLayout
+            android:id="@+id/et_newpassworda"
+            android:layout_width="match_parent"
+            android:layout_below="@id/pwd_rl"
+            android:layout_marginTop="30dp"
+            android:layout_height="wrap_content">
+            <EditText
+                android:id="@+id/et_newpassword"
+                style="@style/login_register_edit_style"
+                android:hint="密码为英文和数字组成，最少8位"
+                android:inputType="textPassword" />
             <ImageView
                 android:id="@+id/iv_pwd_change"
                 android:padding="10dp"
-                android:layout_marginRight="10dp"
-                android:layout_marginLeft="10dp"
                 android:layout_width="40dp"
+                android:layout_marginRight="10dp"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:src="@mipmap/pwd_hide" />
+
         </RelativeLayout>
 
-        <TextView
-            android:id="@+id/oldpassword_error_hint"
-            style="@style/registererrhint_style"
-            android:layout_below="@id/pwd_rl" />
 
-        <EditText
-            android:id="@+id/et_newpassword"
-            style="@style/login_register_edit_style"
-            android:layout_below="@id/pwd_rl"
-            android:layout_marginTop="30dp"
-            android:hint="密码为英文和数字组成，最少8位"
-            android:inputType="textPassword" />
 
         <TextView
             android:id="@+id/newpassword_error_hint"
             style="@style/registererrhint_style"
-            android:layout_below="@id/et_newpassword" />
+            android:layout_below="@id/et_newpassworda" />
 
         <EditText
             android:id="@+id/et_again_newpassword"
             style="@style/login_register_edit_style"
-            android:layout_below="@id/et_newpassword"
+            android:layout_below="@id/et_newpassworda"
             android:layout_marginTop="30dp"
             android:hint="再次输入新密码"
             android:inputType="textPassword" />
diff --git a/PersonalCenter/app/src/main/res/layout/activity_main.xml b/PersonalCenter/app/src/main/res/layout/activity_main.xml
index 05beaea..5d43eb6 100644
--- a/PersonalCenter/app/src/main/res/layout/activity_main.xml
+++ b/PersonalCenter/app/src/main/res/layout/activity_main.xml
@@ -496,6 +496,8 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="2"
                         android:hint="未填写"
+                        android:maxLines="2"
+                        android:ellipsize="end"
                         android:textSize="20sp" />
                 </LinearLayout>
 
diff --git a/PersonalCenter/app/src/main/res/layout/fragment_changge_presonal_info.xml b/PersonalCenter/app/src/main/res/layout/fragment_changge_presonal_info.xml
index 96f34d9..b53459f 100644
--- a/PersonalCenter/app/src/main/res/layout/fragment_changge_presonal_info.xml
+++ b/PersonalCenter/app/src/main/res/layout/fragment_changge_presonal_info.xml
@@ -51,7 +51,9 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:gravity="center"
+            android:gravity="right"
+            android:layout_marginRight="50dp"
+            android:orientation="vertical"
             android:layout_height="match_parent">
             <TextView
                 android:id="@+id/tv_presonal"
@@ -60,13 +62,21 @@
                 android:textSize="22sp"
                 android:textColor="@color/login_edittext_pressed"
                 android:text="个人信息"/>
+            <View
+                android:layout_width="90dp"
+                android:layout_height="3dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/login_edittext_pressed"
+                />
+
 
         </LinearLayout>
         <LinearLayout
             android:id="@+id/tv_version"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:gravity="center"
+            android:gravity="left"
+            android:layout_marginLeft="50dp"
             android:layout_height="match_parent">
             <TextView
                 android:textSize="22sp"
diff --git a/PersonalCenter/app/src/main/res/layout/fragment_changge_version_info.xml b/PersonalCenter/app/src/main/res/layout/fragment_changge_version_info.xml
index 1d36ecf..8fed948 100644
--- a/PersonalCenter/app/src/main/res/layout/fragment_changge_version_info.xml
+++ b/PersonalCenter/app/src/main/res/layout/fragment_changge_version_info.xml
@@ -51,7 +51,8 @@
             android:id="@+id/tv_presons"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:gravity="center"
+            android:gravity="right"
+            android:layout_marginRight="50dp"
             android:layout_height="match_parent">
             <TextView
                 android:id="@+id/tv_presonal"
@@ -64,7 +65,9 @@
         <LinearLayout
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:gravity="center"
+            android:gravity="left"
+            android:layout_marginLeft="50dp"
+            android:orientation="vertical"
             android:layout_height="match_parent">
             <TextView
                 android:textSize="22sp"
@@ -72,13 +75,19 @@
                 android:layout_height="wrap_content"
                 android:textColor="@color/login_edittext_pressed"
                 android:text="版本信息"/>
+            <View
+                android:layout_marginTop="5dp"
+                android:layout_width="90dp"
+                android:layout_height="3dp"
+                android:background="@color/login_edittext_pressed"
+                />
 
         </LinearLayout>
 
     </LinearLayout>
     <GridView
         android:id="@+id/grideview"
-        android:layout_margin="30dp"
+        android:layout_margin="40dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"