Commit 0034c56ebb66415561545ee73297dc3ee5521b09
1 parent
522aba5124
Exists in
master
完善个人中心
Showing
11 changed files
with
115 additions
and
38 deletions
Show diff stats
PersonalCenter/.idea/misc.xml
| ... | ... | @@ -37,7 +37,7 @@ |
| 37 | 37 | <ConfirmationsSetting value="0" id="Add" /> |
| 38 | 38 | <ConfirmationsSetting value="0" id="Remove" /> |
| 39 | 39 | </component> |
| 40 | - <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"> | |
| 40 | + <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"> | |
| 41 | 41 | <output url="file://$PROJECT_DIR$/build/classes" /> |
| 42 | 42 | </component> |
| 43 | 43 | <component name="ProjectType"> | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
| ... | ... | @@ -42,6 +42,7 @@ import com.hjx.personalcenter.model.SignInfo; |
| 42 | 42 | import com.hjx.personalcenter.model.VideoInfo; |
| 43 | 43 | import com.hjx.personalcenter.update.UpdateChecker; |
| 44 | 44 | import com.hjx.personalcenter.util.AlertUtils; |
| 45 | +import com.hjx.personalcenter.util.BrithdayStar; | |
| 45 | 46 | import com.hjx.personalcenter.util.CropUtils; |
| 46 | 47 | import com.hjx.personalcenter.util.DialogPermission; |
| 47 | 48 | import com.hjx.personalcenter.util.FileUtil; |
| ... | ... | @@ -110,6 +111,22 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe |
| 110 | 111 | iv_sex.setImageResource(R.mipmap.women); |
| 111 | 112 | } |
| 112 | 113 | mSimpleDraweeView.setImageURI(cardinfoBean.getPortrait()); |
| 114 | + //加载星座 | |
| 115 | + BrithdayStar brithdayStar = new BrithdayStar(); | |
| 116 | + if (cardinfoBean.getBirthday() ==null||"".equals(cardinfoBean.getBirthday())) { | |
| 117 | + tv_mygad.setText(""); | |
| 118 | + } else { | |
| 119 | + String xiongzuo = brithdayStar.getConstellations(cardinfoBean.getBirthday()); | |
| 120 | + tv_mygad.setText(xiongzuo); | |
| 121 | + } | |
| 122 | + //保存个人信息 | |
| 123 | + SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTUSERNAME,cardinfoBean.getNickName()); | |
| 124 | + SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTGRADES,cardinfoBean.getGrade().getGradeName()); | |
| 125 | + SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTSCHOOL,cardinfoBean.getSchool().getSchoolName()); | |
| 126 | + SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTCONSTELLATION,cardinfoBean.getBirthday()); | |
| 127 | + SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTSEX,tv_sex.getText().toString()); | |
| 128 | + SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTQQ,cardinfoBean.getQq()); | |
| 129 | + | |
| 113 | 130 | String graderID = cardinfoBean.getGrade().getGradeId(); |
| 114 | 131 | String userID = SaveParam.getInstance().getLoginParam(MainActivity.this, "userId"); |
| 115 | 132 | //账户类型 |
| ... | ... | @@ -446,13 +463,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe |
| 446 | 463 | String userID = SaveParam.getInstance().getLoginParam(this, "userId"); |
| 447 | 464 | //账户类型 |
| 448 | 465 | String accounts = SaveParam.getInstance().getCustomizeParam(this, SaveParam.ACCOUNT); |
| 449 | - //加载个人信息 | |
| 450 | - String xiongzuo = SaveParam.getInstance().getLoginParam(this, SaveParam.CONSTELLATION); | |
| 451 | - if (xiongzuo == null) { | |
| 452 | - tv_mygad.setText(""); | |
| 453 | - } else { | |
| 454 | - tv_mygad.setText(xiongzuo); | |
| 455 | - } | |
| 456 | 466 | try { |
| 457 | 467 | int graderID; |
| 458 | 468 | long auserID = Long.parseLong(userID); | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java
| ... | ... | @@ -113,9 +113,16 @@ public class RegisterInfoActivity extends AppCompatActivity implements View.OnCl |
| 113 | 113 | String register6 = et_region.getText().toString().trim(); |
| 114 | 114 | String register7 = et_grade.getText().toString().trim(); |
| 115 | 115 | String register8 = et_school.getText().toString().trim(); |
| 116 | + String grade; | |
| 116 | 117 | if (Content.accountflag == 2) { |
| 118 | + String accounts = SaveParam.getInstance().getCustomizeParam(RegisterInfoActivity.this,SaveParam.ACCOUNT); | |
| 117 | 119 | String userID = SaveParam.getInstance().getLoginParam(this, "userId"); |
| 118 | - String grade = SaveParam.getInstance().getCustomizeParam(this, SaveParam.GRADENS); | |
| 120 | + if ("2".equals(accounts)){ | |
| 121 | + grade = SaveParam.getInstance().getCustomizeParam(this, SaveParam.CHILDSGRADENS); | |
| 122 | + }else { | |
| 123 | + grade = SaveParam.getInstance().getCustomizeParam(this, SaveParam.GRADENS); | |
| 124 | + } | |
| 125 | + | |
| 119 | 126 | String School = SaveParam.getInstance().getLoginParam(this, SaveParam.SCHOOOlID); |
| 120 | 127 | String regionId = SaveParam.getInstance().getsaveCityParam(this, SaveParam.COUNTRY); |
| 121 | 128 | String regionId1 = SaveParam.getInstance().getsaveCityParam(this, SaveParam.CITYS); | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java
| ... | ... | @@ -23,7 +23,17 @@ public class SaveParam { |
| 23 | 23 | public static String GRADES = "gadens";//年级 |
| 24 | 24 | public static String SCHOOL = "school";//学校 |
| 25 | 25 | public static String CONSTELLATION = "constellations";//星座 |
| 26 | - public static String HEADURL = "headurl";//星座 | |
| 26 | + public static String HEADURL = "headurl";//头像 | |
| 27 | + | |
| 28 | + //用户个人信息 | |
| 29 | + public static String ACCOUNTUSERNAME = "accountusernames";//昵称 | |
| 30 | + public static String ACCOUNTADRESS = "accountadress";//地址 | |
| 31 | + public static String ACCOUNTGRADES = "accountgadens";//年级 | |
| 32 | + public static String ACCOUNTSCHOOL = "accountschool";//学校 | |
| 33 | + public static String ACCOUNTCONSTELLATION = "accountbthday";//生日 | |
| 34 | + public static String ACCOUNTSEX = "accountsex";//性别 | |
| 35 | + public static String ACCOUNTQQ= "accountqq";//qq | |
| 36 | + public static String ACCOUNTXINGZUO = "accountxingzuo";//详细地址 | |
| 27 | 37 | |
| 28 | 38 | //电子保卡信息 |
| 29 | 39 | public static String CARDPHONE = "cardphone";//保卡手机号 | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java
| ... | ... | @@ -33,7 +33,6 @@ import com.hjx.personalcenter.model.GradeInfo; |
| 33 | 33 | import com.hjx.personalcenter.model.ProvinceInfo; |
| 34 | 34 | import com.hjx.personalcenter.model.SchoolInfo; |
| 35 | 35 | import com.hjx.personalcenter.util.AlertUtils; |
| 36 | -import com.hjx.personalcenter.util.BrithdayStar; | |
| 37 | 36 | import com.hjx.personalcenter.util.GetDevicesUtil; |
| 38 | 37 | import com.mylhyl.circledialog.CircleDialog; |
| 39 | 38 | import com.mylhyl.circledialog.callback.ConfigDialog; |
| ... | ... | @@ -108,6 +107,26 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener |
| 108 | 107 | } |
| 109 | 108 | |
| 110 | 109 | private void initData() { |
| 110 | + //初始化个人信息 | |
| 111 | + String name = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTUSERNAME); | |
| 112 | + String adress1 = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTADRESS); | |
| 113 | + String adress2 = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTXINGZUO); | |
| 114 | + String sex = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTSEX); | |
| 115 | + String bithday = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTCONSTELLATION); | |
| 116 | + String qq = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTQQ); | |
| 117 | + String grader = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTGRADES); | |
| 118 | + String school = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ACCOUNTSCHOOL); | |
| 119 | + tv_username1.setText(name); | |
| 120 | + tv_useinfo_qq.setText(qq); | |
| 121 | + tv_sex.setText(sex); | |
| 122 | + tv_useinfo_birthday.setText(bithday); | |
| 123 | + tv_useinfo_gender.setText(grader); | |
| 124 | + tv_useinfo_school.setText(school); | |
| 125 | + tv_useinfo_adress1.setText(adress2); | |
| 126 | + tv_useinfo_adress.setText(adress1); | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 111 | 130 | |
| 112 | 131 | } |
| 113 | 132 | |
| ... | ... | @@ -124,6 +143,7 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener |
| 124 | 143 | my_school.setOnClickListener(this); |
| 125 | 144 | sub.setOnClickListener(this); |
| 126 | 145 | tv_version.setOnClickListener(this); |
| 146 | + ccancel.setOnClickListener(this); | |
| 127 | 147 | } |
| 128 | 148 | |
| 129 | 149 | @Override |
| ... | ... | @@ -216,16 +236,12 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener |
| 216 | 236 | AlertUtils.showToast(getActivity(), "请将信息填写完整！"); |
| 217 | 237 | return; |
| 218 | 238 | } else { |
| 219 | - | |
| 220 | 239 | int a = 0, b = 0; |
| 221 | 240 | int d = 1; |
| 222 | 241 | Object schoolids; |
| 223 | 242 | Long f = null; |
| 224 | - //保存星座 | |
| 225 | - BrithdayStar brithdayStar = new BrithdayStar(); | |
| 226 | - String s = brithdayStar.getConstellations(tv_useinfo_birthday.getText().toString()); | |
| 227 | - SaveParam.getInstance().saveCustomizeParam(getActivity(), SaveParam.CONSTELLATION, s); | |
| 228 | - | |
| 243 | + SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.ACCOUNTADRESS,presonal4); | |
| 244 | + SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.ACCOUNTXINGZUO,presonal2); | |
| 229 | 245 | String regionId = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.COUNTRY); |
| 230 | 246 | String regionId1 = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.CITYS); |
| 231 | 247 | if (regionId == null) { | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java
| ... | ... | @@ -152,6 +152,7 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem |
| 152 | 152 | gridView.setOnItemClickListener(this); |
| 153 | 153 | sub.setOnClickListener(this); |
| 154 | 154 | tv_presons.setOnClickListener(this); |
| 155 | + cances.setOnClickListener(this); | |
| 155 | 156 | } |
| 156 | 157 | |
| 157 | 158 | @Override | ... | ... |
PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java
| ... | ... | @@ -182,6 +182,8 @@ public class HttpManager { |
| 182 | 182 | |
| 183 | 183 | //修改密码 |
| 184 | 184 | public void changepwd(final Context context, String username, String old_pwd1, String newpassword3) { |
| 185 | + mProgress = DialogPermission.showProgress(context, null, "正在修改密码...", | |
| 186 | + false, true, null); | |
| 185 | 187 | RequestParams params = new RequestParams(); |
| 186 | 188 | params.put(HttpKey.USERNAME, username); |
| 187 | 189 | params.put(HttpKey.OLDPASS, old_pwd1); |
| ... | ... | @@ -191,6 +193,7 @@ public class HttpManager { |
| 191 | 193 | HttpClient.getInstance().post(HttpUrl.changepassword, params, new AsyncHttpResponseHandler() { |
| 192 | 194 | @Override |
| 193 | 195 | public void onSuccess(int i, Header[] headers, byte[] bytes) { |
| 196 | + closeProgress(); | |
| 194 | 197 | try { |
| 195 | 198 | JSONObject jsonObject = new JSONObject(new String(bytes)); |
| 196 | 199 | String status = jsonObject.optString("status"); |
| ... | ... | @@ -212,6 +215,7 @@ public class HttpManager { |
| 212 | 215 | |
| 213 | 216 | @Override |
| 214 | 217 | public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) { |
| 218 | + closeProgress(); | |
| 215 | 219 | Log.e("test", "onFailure" + new String(bytes)); |
| 216 | 220 | AlertUtils.showToast(context, "无法链接到服务器,请检查您的网络或稍后重试!"); |
| 217 | 221 | } | ... | ... |
PersonalCenter/app/src/main/res/layout/activity_changepsword.xml
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 | android:layout_width="wrap_content" |
| 27 | 27 | android:layout_height="wrap_content" |
| 28 | 28 | android:layout_centerInParent="true" |
| 29 | - android:text="@string/string_menu_title" | |
| 29 | + android:text="修改密码" | |
| 30 | 30 | android:textColor="@android:color/white" |
| 31 | 31 | android:textSize="22sp" /> |
| 32 | 32 | </RelativeLayout> |
| ... | ... | @@ -51,40 +51,48 @@ |
| 51 | 51 | style="@style/login_register_edit_style" |
| 52 | 52 | android:hint="输入原密码" |
| 53 | 53 | android:inputType="textPassword" /> |
| 54 | + | |
| 55 | + </RelativeLayout> | |
| 56 | + | |
| 57 | + | |
| 58 | + <TextView | |
| 59 | + android:id="@+id/oldpassword_error_hint" | |
| 60 | + style="@style/registererrhint_style" | |
| 61 | + android:layout_below="@id/pwd_rl" /> | |
| 62 | + <RelativeLayout | |
| 63 | + android:id="@+id/et_newpassworda" | |
| 64 | + android:layout_width="match_parent" | |
| 65 | + android:layout_below="@id/pwd_rl" | |
| 66 | + android:layout_marginTop="30dp" | |
| 67 | + android:layout_height="wrap_content"> | |
| 68 | + <EditText | |
| 69 | + android:id="@+id/et_newpassword" | |
| 70 | + style="@style/login_register_edit_style" | |
| 71 | + android:hint="密码为英文和数字组成，最少8位" | |
| 72 | + android:inputType="textPassword" /> | |
| 54 | 73 | <ImageView |
| 55 | 74 | android:id="@+id/iv_pwd_change" |
| 56 | 75 | android:padding="10dp" |
| 57 | - android:layout_marginRight="10dp" | |
| 58 | - android:layout_marginLeft="10dp" | |
| 59 | 76 | android:layout_width="40dp" |
| 77 | + android:layout_marginRight="10dp" | |
| 60 | 78 | android:layout_height="wrap_content" |
| 61 | 79 | android:layout_alignParentRight="true" |
| 62 | 80 | android:layout_centerVertical="true" |
| 63 | 81 | android:src="@mipmap/pwd_hide" /> |
| 82 | + | |
| 64 | 83 | </RelativeLayout> |
| 65 | 84 | |
| 66 | - <TextView | |
| 67 | - android:id="@+id/oldpassword_error_hint" | |
| 68 | - style="@style/registererrhint_style" | |
| 69 | - android:layout_below="@id/pwd_rl" /> | |
| 70 | 85 | |
| 71 | - <EditText | |
| 72 | - android:id="@+id/et_newpassword" | |
| 73 | - style="@style/login_register_edit_style" | |
| 74 | - android:layout_below="@id/pwd_rl" | |
| 75 | - android:layout_marginTop="30dp" | |
| 76 | - android:hint="密码为英文和数字组成，最少8位" | |
| 77 | - android:inputType="textPassword" /> | |
| 78 | 86 | |
| 79 | 87 | <TextView |
| 80 | 88 | android:id="@+id/newpassword_error_hint" |
| 81 | 89 | style="@style/registererrhint_style" |
| 82 | - android:layout_below="@id/et_newpassword" /> | |
| 90 | + android:layout_below="@id/et_newpassworda" /> | |
| 83 | 91 | |
| 84 | 92 | <EditText |
| 85 | 93 | android:id="@+id/et_again_newpassword" |
| 86 | 94 | style="@style/login_register_edit_style" |
| 87 | - android:layout_below="@id/et_newpassword" | |
| 95 | + android:layout_below="@id/et_newpassworda" | |
| 88 | 96 | android:layout_marginTop="30dp" |
| 89 | 97 | android:hint="再次输入新密码" |
| 90 | 98 | android:inputType="textPassword" /> | ... | ... |
PersonalCenter/app/src/main/res/layout/activity_main.xml
PersonalCenter/app/src/main/res/layout/fragment_changge_presonal_info.xml
| ... | ... | @@ -51,7 +51,9 @@ |
| 51 | 51 | <LinearLayout |
| 52 | 52 | android:layout_width="0dp" |
| 53 | 53 | android:layout_weight="1" |
| 54 | - android:gravity="center" | |
| 54 | + android:gravity="right" | |
| 55 | + android:layout_marginRight="50dp" | |
| 56 | + android:orientation="vertical" | |
| 55 | 57 | android:layout_height="match_parent"> |
| 56 | 58 | <TextView |
| 57 | 59 | android:id="@+id/tv_presonal" |
| ... | ... | @@ -60,13 +62,21 @@ |
| 60 | 62 | android:textSize="22sp" |
| 61 | 63 | android:textColor="@color/login_edittext_pressed" |
| 62 | 64 | android:text="个人信息"/> |
| 65 | + <View | |
| 66 | + android:layout_width="90dp" | |
| 67 | + android:layout_height="3dp" | |
| 68 | + android:layout_marginTop="5dp" | |
| 69 | + android:background="@color/login_edittext_pressed" | |
| 70 | + /> | |
| 71 | + | |
| 63 | 72 | |
| 64 | 73 | </LinearLayout> |
| 65 | 74 | <LinearLayout |
| 66 | 75 | android:id="@+id/tv_version" |
| 67 | 76 | android:layout_width="0dp" |
| 68 | 77 | android:layout_weight="1" |
| 69 | - android:gravity="center" | |
| 78 | + android:gravity="left" | |
| 79 | + android:layout_marginLeft="50dp" | |
| 70 | 80 | android:layout_height="match_parent"> |
| 71 | 81 | <TextView |
| 72 | 82 | android:textSize="22sp" | ... | ... |
PersonalCenter/app/src/main/res/layout/fragment_changge_version_info.xml
| ... | ... | @@ -51,7 +51,8 @@ |
| 51 | 51 | android:id="@+id/tv_presons" |
| 52 | 52 | android:layout_width="0dp" |
| 53 | 53 | android:layout_weight="1" |
| 54 | - android:gravity="center" | |
| 54 | + android:gravity="right" | |
| 55 | + android:layout_marginRight="50dp" | |
| 55 | 56 | android:layout_height="match_parent"> |
| 56 | 57 | <TextView |
| 57 | 58 | android:id="@+id/tv_presonal" |
| ... | ... | @@ -64,7 +65,9 @@ |
| 64 | 65 | <LinearLayout |
| 65 | 66 | android:layout_width="0dp" |
| 66 | 67 | android:layout_weight="1" |
| 67 | - android:gravity="center" | |
| 68 | + android:gravity="left" | |
| 69 | + android:layout_marginLeft="50dp" | |
| 70 | + android:orientation="vertical" | |
| 68 | 71 | android:layout_height="match_parent"> |
| 69 | 72 | <TextView |
| 70 | 73 | android:textSize="22sp" |
| ... | ... | @@ -72,13 +75,19 @@ |
| 72 | 75 | android:layout_height="wrap_content" |
| 73 | 76 | android:textColor="@color/login_edittext_pressed" |
| 74 | 77 | android:text="版本信息"/> |
| 78 | + <View | |
| 79 | + android:layout_marginTop="5dp" | |
| 80 | + android:layout_width="90dp" | |
| 81 | + android:layout_height="3dp" | |
| 82 | + android:background="@color/login_edittext_pressed" | |
| 83 | + /> | |
| 75 | 84 | |
| 76 | 85 | </LinearLayout> |
| 77 | 86 | |
| 78 | 87 | </LinearLayout> |
| 79 | 88 | <GridView |
| 80 | 89 | android:id="@+id/grideview" |
| 81 | - android:layout_margin="30dp" | |
| 90 | + android:layout_margin="40dp" | |
| 82 | 91 | android:layout_width="match_parent" |
| 83 | 92 | android:layout_height="wrap_content" |
| 84 | 93 | android:gravity="center_vertical" | ... | ... |