From 1ae185f9e12d6e831dc694eb289778548c50e078 Mon Sep 17 00:00:00 2001 From: itgaojian163 Date: Thu, 3 Nov 2022 15:54:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 11 + app/build.gradle | 4 +- .../cm_utils/constant/PathConfig.java | 13 +- .../core/beans/ChangeUserInfoBean.java | 54 ++ .../cm_utils/core/beans/SaveUserInfoBean.java | 192 ++++++ .../core/retrofit_net/api/BaseApiService.java | 26 +- .../retrofit_net/bean/UserExpandInfoBean.java | 419 +++++++++++++ cm_utils/src/main/res/values/styles.xml | 74 +++ modulemine/build.gradle | 1 + modulemine/src/main/AndroidManifest.xml | 10 + .../activity/ChangePhoneActivity.java | 14 +- .../activity/MineInfoDetailActivity.java | 2 +- .../activity/MineInfoEditActivity.java | 2 +- .../activity/NewMineInfoDetailActivity.java | 151 +++++ .../activity/NewMineInfoEditActivity.java | 550 ++++++++++++++++++ .../modulemine/activity/SettingActivity.java | 8 +- .../fragments/MineMainFragment.java | 29 +- .../res/drawable/shp_rectangle_gray_df.xml | 6 + .../layout/activity_new_mine_info_edit.xml | 283 +++++++++ .../layout/activity_new_mine_infor_detail.xml | 266 +++++++++ modulemine/src/main/res/values/styles.xml | 1 + 21 files changed, 2076 insertions(+), 40 deletions(-) create mode 100755 cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/ChangeUserInfoBean.java create mode 100644 cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/SaveUserInfoBean.java create mode 100644 cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/bean/UserExpandInfoBean.java create mode 100644 modulemine/src/main/java/com/tengshisoft/modulemine/activity/NewMineInfoDetailActivity.java create mode 100644 modulemine/src/main/java/com/tengshisoft/modulemine/activity/NewMineInfoEditActivity.java create mode 100755 modulemine/src/main/res/drawable/shp_rectangle_gray_df.xml create mode 100644 modulemine/src/main/res/layout/activity_new_mine_info_edit.xml create mode 100644 modulemine/src/main/res/layout/activity_new_mine_infor_detail.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 1a23ba9..768b1f1 100755 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,8 +8,19 @@ diff --git a/app/build.gradle b/app/build.gradle index df69934..ed0273d 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,13 +3,13 @@ apply plugin: 'com.android.application' android { signingConfigs { release { - storeFile file('/Users/adam/Documents/tengshi.jks') + storeFile file('/Users/adam/Documents/work/tengshi.jks') storePassword 'aaa111!!!' keyAlias = 'tengshi' keyPassword 'aaa111!!!' } debug { - storeFile file('/Users/adam/Documents/tengshi.jks') + storeFile file('/Users/adam/Documents/work/tengshi.jks') storePassword 'aaa111!!!' keyAlias = 'tengshi' keyPassword 'aaa111!!!' diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java index cb4fb6b..1722bdd 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java @@ -42,7 +42,7 @@ public class PathConfig { public static final String USER_TYPE_P = "e483f019-d971-49ac-b5fa-3314220da703"; public static final String USER_TYPE_N = "bc405346-8714-4ded-89ac-9cc4d755f66a"; public static final String USER_TYPE_X = "25affe67-134c-4a32-ba41-64b0cfedc782"; -// public static final String APP_VERSION_ID = "f5935aa1-4405-4cbe-85bc-d7c1a8ddc9c4"; + // public static final String APP_VERSION_ID = "f5935aa1-4405-4cbe-85bc-d7c1a8ddc9c4"; public static final String APP_VERSION_ID = "10e53e1e-2c21-4b5d-b81f-b514abece994";//测试 public static final String NEWS_ID = "f497904b-7727-4832-891c-604c36ae4167";//文化动态ID @@ -164,6 +164,8 @@ public class PathConfig { public static final String PATH_MODULE_CULTURAL_MINE_SETTING = "/modulemine/activity/setting";//设置 public static final String PATH_MODULE_MINE_MINEINFO_EDIT = "/modulemine/activity/mineinfoedit";//个人信息编辑 public static final String PATH_MODULE_MINE_MINEINFO_DETAIL = "/modulemine/activity/mineinfodetail";//个人信息详情 + public static final String PATH_MODULE_MINE_MINEINFO_EDIT_NEW = "/modulemine/activity/userInfoEdit";//个人详细信息编辑 + public static final String PATH_MODULE_MINE_MINEINFO_DETAIL_NEW = "/modulemine/activity/userInfoDetail";//个人详细信息 public static final String PATH_MODULE_MINE_CHANGE_PHONE = "/modulemine/activity/changephone";//修改手机号 public static final String PATH_MODULE_MINE_CHANGE_PWD = "/modulemine/activity/changepwd";//修改密码 @@ -214,11 +216,12 @@ public class PathConfig { public static final String PATH_MODULE_CMUTILS_CONDITION = "/modulecmutils/activity/condition";//条件查询activ //=====================字典ID========================== - public static final String DID_WORK = "";//工作状态 - public static final String DID_PI = "";// - public static final String DID_EDU = "";//学历 + public static final String DID_WORK = "3a019a6f-d1f7-4a45-8426-e2300f533bca";//工作状态 + public static final String DID_PI = "f9ff0a87-7ccf-4257-9471-f337e9c2b857";//政治面貌 + public static final String DID_EDU = "7cf06b2e-418e-4be8-b4f8-be49cef7d1f0";//学历 public static final String DID_NATIVE = "";//籍贯 - public static final String DID_NATION = "";//民族 + public static final String DID_SEX = "90f09612-9deb-4229-8d73-d6a865056cde";//性别 + public static final String DID_NATION = "e64a01f7-dac9-40da-a2fe-50225fb287aa";//民族 public static final String DID_ADDRESS = "";//地址 public static final String DID_SERVICE_AREA = "761d8633-3c2f-4e92-b32d-fb50d3dc07b7";//服务区域 public static final String DID_SERVICE_TYPE = "a223b308-014a-4e89-93fa-035a564e7fda";//服务类别 diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/ChangeUserInfoBean.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/ChangeUserInfoBean.java new file mode 100755 index 0000000..6bfe6c9 --- /dev/null +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/ChangeUserInfoBean.java @@ -0,0 +1,54 @@ +package com.sucstepsoft.cm_utils.core.beans; + +/** + * 作者: Adam + * 日期: 2019/8/15 - 19:04 + * 邮箱: itgaojian@163.com + * 描述: + */ +public class ChangeUserInfoBean { + + /** + * avatar : string + * email : string + * name : string + * phone : string + */ + + private String avatar; + private String email; + private String name; + private String phone; + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } +} diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/SaveUserInfoBean.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/SaveUserInfoBean.java new file mode 100644 index 0000000..97fdcc8 --- /dev/null +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/beans/SaveUserInfoBean.java @@ -0,0 +1,192 @@ +package com.sucstepsoft.cm_utils.core.beans; + +public class SaveUserInfoBean { + // @ApiModelProperty(name = "userRealName", value = "姓名") + private String userRealName; + // @ApiModelProperty(name = "userSex", value = "性别") + private String userSex; + // @ApiModelProperty(name = "userIdCard", value = "身份证") + private String userIdCard; + // @ApiModelProperty(name = "userBirth", value = "生日") +// @CheckEmptyAnnotation(name = "生日", verifyType = "date") + private String userBirth; + // @ApiModelProperty(name = "userNation", value = "民族") + private String userNation; + // @ApiModelProperty(name = "userNative", value = "籍贯") + private String userNative; + // @ApiModelProperty(name = "userEducation", value = "学历") + private String userEducation; + // @ApiModelProperty(name = "userPoliticsStatus", value = "政治面貌") + private String userPoliticsStatus; + // @ApiModelProperty(name = "userEmploymentSituation", value = "就业状况") + private String userEmploymentSituation; + // @ApiModelProperty(name = "userQq", value = "qq号") + private String userQq; + // @ApiModelProperty(name = "userWechat", value = "微信号") + private String userWechat; + // @ApiModelProperty(name = "userWeibo", value = "微博号") + private String userWeibo; + // @ApiModelProperty(name = "userLiveAddress", value = "现住址") + private String userLiveAddress; + // @ApiModelProperty(name = "userAddress", value = "详细地址") + private String userAddress; + // @ApiModelProperty(name = "userZipCode", value = "邮编") + private String userZipCode; + // @ApiModelProperty(name = "userIntroduction", value = "人员简介") + private String userIntroduction; + private String name; + private String email; + private String phone; + + public String getUserRealName() { + return userRealName; + } + + public void setUserRealName(String userRealName) { + this.userRealName = userRealName; + } + + public String getUserSex() { + return userSex; + } + + public void setUserSex(String userSex) { + this.userSex = userSex; + } + + public String getUserIdCard() { + return userIdCard; + } + + public void setUserIdCard(String userIdCard) { + this.userIdCard = userIdCard; + } + + public String getUserBirth() { + return userBirth; + } + + public void setUserBirth(String userBirth) { + this.userBirth = userBirth; + } + + public String getUserNation() { + return userNation; + } + + public void setUserNation(String userNation) { + this.userNation = userNation; + } + + public String getUserNative() { + return userNative; + } + + public void setUserNative(String userNative) { + this.userNative = userNative; + } + + public String getUserEducation() { + return userEducation; + } + + public void setUserEducation(String userEducation) { + this.userEducation = userEducation; + } + + public String getUserPoliticsStatus() { + return userPoliticsStatus; + } + + public void setUserPoliticsStatus(String userPoliticsStatus) { + this.userPoliticsStatus = userPoliticsStatus; + } + + public String getUserEmploymentSituation() { + return userEmploymentSituation; + } + + public void setUserEmploymentSituation(String userEmploymentSituation) { + this.userEmploymentSituation = userEmploymentSituation; + } + + public String getUserQq() { + return userQq; + } + + public void setUserQq(String userQq) { + this.userQq = userQq; + } + + public String getUserWechat() { + return userWechat; + } + + public void setUserWechat(String userWechat) { + this.userWechat = userWechat; + } + + public String getUserWeibo() { + return userWeibo; + } + + public void setUserWeibo(String userWeibo) { + this.userWeibo = userWeibo; + } + + public String getUserLiveAddress() { + return userLiveAddress; + } + + public void setUserLiveAddress(String userLiveAddress) { + this.userLiveAddress = userLiveAddress; + } + + public String getUserAddress() { + return userAddress; + } + + public void setUserAddress(String userAddress) { + this.userAddress = userAddress; + } + + public String getUserZipCode() { + return userZipCode; + } + + public void setUserZipCode(String userZipCode) { + this.userZipCode = userZipCode; + } + + public String getUserIntroduction() { + return userIntroduction; + } + + public void setUserIntroduction(String userIntroduction) { + this.userIntroduction = userIntroduction; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } +} diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java index ae9e28c..a91ccf2 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/api/BaseApiService.java @@ -11,6 +11,7 @@ import com.sucstepsoft.cm_utils.core.beans.UserInfoFieldBean; import com.sucstepsoft.cm_utils.core.beans.UserLoginBean; import com.sucstepsoft.cm_utils.core.retrofit_net.bean.BaseResponseBean; import com.sucstepsoft.cm_utils.core.retrofit_net.bean.BaseUserInfo; +import com.sucstepsoft.cm_utils.core.retrofit_net.bean.UserExpandInfoBean; import com.sucstepsoft.cm_utils.core.retrofit_net.bean.VersionBean; import java.util.List; @@ -33,7 +34,6 @@ import retrofit2.http.PUT; import retrofit2.http.Part; import retrofit2.http.PartMap; import retrofit2.http.Path; -import retrofit2.http.Query; import retrofit2.http.Url; /** @@ -220,8 +220,15 @@ public interface BaseApiService { * 更新用户基本信息 */ @Headers({"Content-Type:application/json", "Accept:application/json"}) - @PUT("app/user/updateuserinfo") - Observable editUserInfo(@Body RequestBody body, @Header("token") String token); + @PUT("app/base/userexpand/update-byuserid/{userId}") + Observable editUserInfo(@Path("userId") String id, @Body RequestBody body, @Header("token") String token); + + /** + * 获取用户拓展信息 + */ + @Headers({"Content-Type:application/json", "Accept:application/json"}) + @GET("app/base/userexpand/get-byuserid/{userId}") + Observable getUserExpandInfo(@Path("userId") String id, @Header("token") String token); /** * 获取用户基本信息 @@ -240,7 +247,7 @@ public interface BaseApiService { * PUT /app/user/updatephoneusername/{phone} */ @Headers({"Content-Type:application/json", "Accept:application/json"}) - @PUT("app/user/updatephoneusername/{phone}") + @PUT("app/user/update-phone-username/{phone}") Observable doChangePhone(@Body RequestBody body, @Path("phone") String phone, @Header("token") String token); /** @@ -248,7 +255,7 @@ public interface BaseApiService { * PUT /app/user/updateuserpassword */ @Headers({"Content-Type:application/json", "Accept:application/json"}) - @PUT("app/user/updateuserpassword") + @PUT("app/user/update-password") Observable doChangePwd(@Body RequestBody body, @Header("token") String token); /** @@ -269,6 +276,15 @@ public interface BaseApiService { @GET("app/volunteer/isvolunteer") Observable getUserIsVolunteer(@Header("token") String token); + /** + * 修改个人信息 + * + * @param userInfo + * @return + */ + @Headers({"Content-Type:application/json", "Accept:application/json"}) + @PUT("app/user/update-avatar") + Observable doChangeUserInfo(@Body RequestBody userInfo, @Header("token") String token); @GET Call downloadApk(@Url String url); diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/bean/UserExpandInfoBean.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/bean/UserExpandInfoBean.java new file mode 100644 index 0000000..02f2eef --- /dev/null +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/bean/UserExpandInfoBean.java @@ -0,0 +1,419 @@ +package com.sucstepsoft.cm_utils.core.retrofit_net.bean; + +public class UserExpandInfoBean { + + private String departmentIds; + private String departmentNames; + private String gmtCreate; + private String groupIds; + private String groupNames; + private String lastLoginAddress; + private String lastLoginTime; + private int loginType; + private String positionIds; + private String positionNames; + private String roleIds; + private String roleNames; + private String userAddress; + private String userAvatar; + private String userBirth; + private String userEducation; + private String userEducationName; + private String userEmail; + private String userEmploymentSituation; + private String userEmploymentSituationName; + private String userExpandId; + private String userExpiredDate; + private String userId; + private String userIdCard; + private String userIntroduction; + private String userLatitude; + private String userLiveAddress; + private String userLongitude; + private String userName; + private String userNation; + private String userNationName; + private String userNative; + private String userPhone; + private String userPoliticsStatus; + private String userPoliticsStatusName; + private String userQq; + private String userRealName; + private String userSex; + private String userSexName; + private int userState; + private int userType; + private String userUKey; + private String userUsername; + private String userWechat; + private String userWeibo; + private String userZipCode; + + public String getDepartmentIds() { + return departmentIds; + } + + public void setDepartmentIds(String departmentIds) { + this.departmentIds = departmentIds; + } + + public String getDepartmentNames() { + return departmentNames; + } + + public void setDepartmentNames(String departmentNames) { + this.departmentNames = departmentNames; + } + + public String getGmtCreate() { + return gmtCreate; + } + + public void setGmtCreate(String gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public String getGroupIds() { + return groupIds; + } + + public void setGroupIds(String groupIds) { + this.groupIds = groupIds; + } + + public String getGroupNames() { + return groupNames; + } + + public void setGroupNames(String groupNames) { + this.groupNames = groupNames; + } + + public String getLastLoginAddress() { + return lastLoginAddress; + } + + public void setLastLoginAddress(String lastLoginAddress) { + this.lastLoginAddress = lastLoginAddress; + } + + public String getLastLoginTime() { + return lastLoginTime; + } + + public void setLastLoginTime(String lastLoginTime) { + this.lastLoginTime = lastLoginTime; + } + + public int getLoginType() { + return loginType; + } + + public void setLoginType(int loginType) { + this.loginType = loginType; + } + + public String getPositionIds() { + return positionIds; + } + + public void setPositionIds(String positionIds) { + this.positionIds = positionIds; + } + + public String getPositionNames() { + return positionNames; + } + + public void setPositionNames(String positionNames) { + this.positionNames = positionNames; + } + + public String getRoleIds() { + return roleIds; + } + + public void setRoleIds(String roleIds) { + this.roleIds = roleIds; + } + + public String getRoleNames() { + return roleNames; + } + + public void setRoleNames(String roleNames) { + this.roleNames = roleNames; + } + + public String getUserAddress() { + return userAddress; + } + + public void setUserAddress(String userAddress) { + this.userAddress = userAddress; + } + + public String getUserAvatar() { + return userAvatar; + } + + public void setUserAvatar(String userAvatar) { + this.userAvatar = userAvatar; + } + + public String getUserBirth() { + return userBirth; + } + + public void setUserBirth(String userBirth) { + this.userBirth = userBirth; + } + + public String getUserEducation() { + return userEducation; + } + + public void setUserEducation(String userEducation) { + this.userEducation = userEducation; + } + + public String getUserEducationName() { + return userEducationName; + } + + public void setUserEducationName(String userEducationName) { + this.userEducationName = userEducationName; + } + + public String getUserEmail() { + return userEmail; + } + + public void setUserEmail(String userEmail) { + this.userEmail = userEmail; + } + + public String getUserEmploymentSituation() { + return userEmploymentSituation; + } + + public void setUserEmploymentSituation(String userEmploymentSituation) { + this.userEmploymentSituation = userEmploymentSituation; + } + + public String getUserEmploymentSituationName() { + return userEmploymentSituationName; + } + + public void setUserEmploymentSituationName(String userEmploymentSituationName) { + this.userEmploymentSituationName = userEmploymentSituationName; + } + + public String getUserExpandId() { + return userExpandId; + } + + public void setUserExpandId(String userExpandId) { + this.userExpandId = userExpandId; + } + + public String getUserExpiredDate() { + return userExpiredDate; + } + + public void setUserExpiredDate(String userExpiredDate) { + this.userExpiredDate = userExpiredDate; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserIdCard() { + return userIdCard; + } + + public void setUserIdCard(String userIdCard) { + this.userIdCard = userIdCard; + } + + public String getUserIntroduction() { + return userIntroduction; + } + + public void setUserIntroduction(String userIntroduction) { + this.userIntroduction = userIntroduction; + } + + public String getUserLatitude() { + return userLatitude; + } + + public void setUserLatitude(String userLatitude) { + this.userLatitude = userLatitude; + } + + public String getUserLiveAddress() { + return userLiveAddress; + } + + public void setUserLiveAddress(String userLiveAddress) { + this.userLiveAddress = userLiveAddress; + } + + public String getUserLongitude() { + return userLongitude; + } + + public void setUserLongitude(String userLongitude) { + this.userLongitude = userLongitude; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getUserNation() { + return userNation; + } + + public void setUserNation(String userNation) { + this.userNation = userNation; + } + + public String getUserNationName() { + return userNationName; + } + + public void setUserNationName(String userNationName) { + this.userNationName = userNationName; + } + + public String getUserNative() { + return userNative; + } + + public void setUserNative(String userNative) { + this.userNative = userNative; + } + + public String getUserPhone() { + return userPhone; + } + + public void setUserPhone(String userPhone) { + this.userPhone = userPhone; + } + + public String getUserPoliticsStatus() { + return userPoliticsStatus; + } + + public void setUserPoliticsStatus(String userPoliticsStatus) { + this.userPoliticsStatus = userPoliticsStatus; + } + + public String getUserPoliticsStatusName() { + return userPoliticsStatusName; + } + + public void setUserPoliticsStatusName(String userPoliticsStatusName) { + this.userPoliticsStatusName = userPoliticsStatusName; + } + + public String getUserQq() { + return userQq; + } + + public void setUserQq(String userQq) { + this.userQq = userQq; + } + + public String getUserRealName() { + return userRealName; + } + + public void setUserRealName(String userRealName) { + this.userRealName = userRealName; + } + + public String getUserSex() { + return userSex; + } + + public void setUserSex(String userSex) { + this.userSex = userSex; + } + + public String getUserSexName() { + return userSexName; + } + + public void setUserSexName(String userSexName) { + this.userSexName = userSexName; + } + + public int getUserState() { + return userState; + } + + public void setUserState(int userState) { + this.userState = userState; + } + + public int getUserType() { + return userType; + } + + public void setUserType(int userType) { + this.userType = userType; + } + + public String getUserUKey() { + return userUKey; + } + + public void setUserUKey(String userUKey) { + this.userUKey = userUKey; + } + + public String getUserUsername() { + return userUsername; + } + + public void setUserUsername(String userUsername) { + this.userUsername = userUsername; + } + + public String getUserWechat() { + return userWechat; + } + + public void setUserWechat(String userWechat) { + this.userWechat = userWechat; + } + + public String getUserWeibo() { + return userWeibo; + } + + public void setUserWeibo(String userWeibo) { + this.userWeibo = userWeibo; + } + + public String getUserZipCode() { + return userZipCode; + } + + public void setUserZipCode(String userZipCode) { + this.userZipCode = userZipCode; + } +} diff --git a/cm_utils/src/main/res/values/styles.xml b/cm_utils/src/main/res/values/styles.xml index f18d8ad..7ea801f 100755 --- a/cm_utils/src/main/res/values/styles.xml +++ b/cm_utils/src/main/res/values/styles.xml @@ -250,4 +250,78 @@ @android:color/transparent #ffE91E63 + + + + + + + + + + + + \ No newline at end of file diff --git a/modulemine/build.gradle b/modulemine/build.gradle index a81141a..4692110 100755 --- a/modulemine/build.gradle +++ b/modulemine/build.gradle @@ -38,6 +38,7 @@ dependencies { implementation project(':cm_utils') implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'com.google.android.material:material:1.3.0-alpha03' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/modulemine/src/main/AndroidManifest.xml b/modulemine/src/main/AndroidManifest.xml index 7789dc4..9a9b59a 100755 --- a/modulemine/src/main/AndroidManifest.xml +++ b/modulemine/src/main/AndroidManifest.xml @@ -3,6 +3,16 @@ package="com.tengshisoft.modulemine"> + + () { diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoEditActivity.java b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoEditActivity.java index d447fe3..e1d6493 100755 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoEditActivity.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/MineInfoEditActivity.java @@ -142,7 +142,7 @@ public class MineInfoEditActivity extends BaseActivity { RequestBody body = RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), obj); RetrofitManager.getInstance() .create(BaseApiService.class) - .editUserInfo(body, UserLgUtils.getToken()) + .editUserInfo(UserLgUtils.getUserId(), body, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/NewMineInfoDetailActivity.java b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/NewMineInfoDetailActivity.java new file mode 100644 index 0000000..3dd0efb --- /dev/null +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/NewMineInfoDetailActivity.java @@ -0,0 +1,151 @@ +package com.tengshisoft.modulemine.activity; + +import android.content.Intent; +import android.view.View; +import android.widget.TextView; + +import androidx.annotation.Nullable; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.alibaba.android.arouter.launcher.ARouter; +import com.sucstepsoft.cm_utils.constant.PathConfig; +import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; +import com.sucstepsoft.cm_utils.core.retrofit_net.api.BaseApiService; +import com.sucstepsoft.cm_utils.core.retrofit_net.bean.UserExpandInfoBean; +import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity; +import com.sucstepsoft.cm_utils.utils.ExceptionHandler; +import com.sucstepsoft.cm_utils.utils.UserLgUtils; +import com.tengshisoft.modulemine.R; +import com.tengshisoft.modulemine.R2; + +import butterknife.BindView; +import butterknife.ButterKnife; +import io.reactivex.Observer; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.Disposable; +import io.reactivex.schedulers.Schedulers; + +@Route(path = PathConfig.PATH_MODULE_MINE_MINEINFO_DETAIL_NEW) +public class NewMineInfoDetailActivity extends BaseActivity { + @BindView(R2.id.tv_nickname) + TextView mTvNickName; + @BindView(R2.id.tv_email) + TextView mTvEmail; + @BindView(R2.id.tv_name) + TextView mTvName; + @BindView(R2.id.tv_id_card) + TextView mTvIdCard; + @BindView(R2.id.tv_gender) + TextView mTvGender; + @BindView(R2.id.tv_nation) + TextView mTvNation; + @BindView(R2.id.tv_native) + TextView mTvNative; + @BindView(R2.id.tv_polit) + TextView mTvPolit; + @BindView(R2.id.tv_qq) + TextView mTvQQ; + @BindView(R2.id.tv_weixin) + TextView mTvWeixin; + @BindView(R2.id.tv_weibo) + TextView mTvWeibo; + @BindView(R2.id.tv_current_address) + TextView mTvCurrentAddress; + @BindView(R2.id.tv_post) + TextView mTvPost; + @BindView(R2.id.tv_address) + TextView mTvAddress; + @BindView(R2.id.tv_degree) + TextView mTvDegree; + @BindView(R2.id.tv_work) + TextView mTvWork; + @BindView(R2.id.tv_content) + TextView mTvContent; + @BindView(R2.id.tv_sex) + TextView mTvSex; + @BindView(R2.id.tv_phone) + TextView mTvPhone; + + @Override + public void initData() { + ButterKnife.bind(this); + mTvBaseTitle.setText("个人信息"); + refreshView(STATE_LOAD_LOADING); + mTvPublish.setVisibility(View.VISIBLE); + mTvPublish.setText("修改"); + mTvPublish.setOnClickListener(v -> ARouter.getInstance() + .build(PathConfig.PATH_MODULE_MINE_MINEINFO_EDIT_NEW) + .navigation(mActivity, 12)); + getUserInfo(); + } + + private void getUserInfo() { + RetrofitManager.getInstance() + .create(BaseApiService.class) + .getUserExpandInfo(UserLgUtils.getUserId(), UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(UserExpandInfoBean userExpandInfoBean) { + setDataToView(userExpandInfoBean); + } + + @Override + public void onError(Throwable e) { + refreshView(STATE_LOAD_ERROR); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (requestCode == 12) { + if (resultCode == 13) { + refreshView(STATE_LOAD_LOADING); + getUserInfo(); + } + } + } + + private void setDataToView(UserExpandInfoBean bean) { + refreshView(STATE_LOAD_SUCCESS); + mTvNickName.setText(bean.getUserName()); + mTvEmail.setText(bean.getUserEmail()); + mTvPhone.setText(bean.getUserPhone()); + mTvName.setText(bean.getUserRealName()); + mTvSex.setText(bean.getUserSexName()); + mTvGender.setText(bean.getUserBirth()); + mTvIdCard.setText(bean.getUserIdCard()); + mTvNation.setText(bean.getUserNationName()); + mTvNative.setText(bean.getUserNative()); + mTvPolit.setText(bean.getUserPoliticsStatusName()); + mTvQQ.setText(bean.getUserQq()); + mTvWeixin.setText(bean.getUserWechat()); + mTvWeibo.setText(bean.getUserWeibo()); + mTvCurrentAddress.setText(bean.getUserLiveAddress()); + mTvPost.setText(bean.getUserZipCode()); + mTvAddress.setText(bean.getUserAddress()); + mTvDegree.setText(bean.getUserEducationName()); + mTvWork.setText(bean.getUserEmploymentSituationName()); + mTvContent.setText(bean.getUserIntroduction()); + } + + @Override + protected int setLayoutId() { + return R.layout.activity_new_mine_infor_detail; + } + +} \ No newline at end of file diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/NewMineInfoEditActivity.java b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/NewMineInfoEditActivity.java new file mode 100644 index 0000000..c25e70c --- /dev/null +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/NewMineInfoEditActivity.java @@ -0,0 +1,550 @@ +package com.tengshisoft.modulemine.activity; + +import android.app.ProgressDialog; +import android.graphics.Color; +import android.text.TextUtils; +import android.widget.EditText; +import android.widget.TextView; + +import com.alibaba.android.arouter.facade.annotation.Route; +import com.bigkoo.pickerview.builder.OptionsPickerBuilder; +import com.bigkoo.pickerview.builder.TimePickerBuilder; +import com.bigkoo.pickerview.view.OptionsPickerView; +import com.bigkoo.pickerview.view.TimePickerView; +import com.google.gson.Gson; +import com.sucstepsoft.cm_utils.constant.PathConfig; +import com.sucstepsoft.cm_utils.core.beans.BaseDictionaryBean; +import com.sucstepsoft.cm_utils.core.beans.BaseSuccessBean; +import com.sucstepsoft.cm_utils.core.beans.SaveUserInfoBean; +import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; +import com.sucstepsoft.cm_utils.core.retrofit_net.api.BaseApiService; +import com.sucstepsoft.cm_utils.core.retrofit_net.bean.UserExpandInfoBean; +import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity; +import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView; +import com.sucstepsoft.cm_utils.utils.ExceptionHandler; +import com.sucstepsoft.cm_utils.utils.ToastUtils; +import com.sucstepsoft.cm_utils.utils.UIUtil; +import com.sucstepsoft.cm_utils.utils.UserLgUtils; +import com.tengshisoft.modulemine.R; +import com.tengshisoft.modulemine.R2; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.List; + +import butterknife.BindView; +import butterknife.ButterKnife; +import io.reactivex.Observer; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.Disposable; +import io.reactivex.schedulers.Schedulers; +import okhttp3.RequestBody; + +/** + * 新版个人详细信息编辑 + */ +@Route(path = PathConfig.PATH_MODULE_MINE_MINEINFO_EDIT_NEW) +public class NewMineInfoEditActivity extends BaseActivity { + + @BindView(R2.id.et_nickname) + EditText mEtNickName; + @BindView(R2.id.et_email) + EditText mEtEmail; + @BindView(R2.id.et_name) + EditText mEtName; + @BindView(R2.id.et_id_card) + EditText mEtIdCard; + @BindView(R2.id.tv_gender) + TextView mTvGender; + @BindView(R2.id.tv_sex) + TextView mTvSex; + @BindView(R2.id.tv_nation) + TextView mTvNation; + @BindView(R2.id.et_native) + EditText mEtNative; + @BindView(R2.id.tv_polit) + TextView mTvPolit; + @BindView(R2.id.et_qq) + EditText mEtQQ; + @BindView(R2.id.et_weixin) + EditText mEtWeixin; + @BindView(R2.id.et_weibo) + EditText mEtWeibo; + @BindView(R2.id.et_current_address) + EditText mEtCurrentAddress; + @BindView(R2.id.et_post) + EditText mEtPost; + @BindView(R2.id.et_address) + EditText mEtAddress; + @BindView(R2.id.tv_degree) + TextView mTvDegree; + @BindView(R2.id.tv_work) + TextView mTvWork; + @BindView(R2.id.et_content) + EditText mEtContent; + @BindView(R2.id.btn_confirm) + TypeFaceTextView mBtnConfirm; + @BindView(R2.id.et_phone) + EditText mEtPhone; + + private List mPiList;//政治面貌 + private List mNationList;//民族 + private List mSexList;//性别 + private List mNativeList;//籍贯 + private List mEduList;//学历 + private List mWorkList;//从业状况 + + private OptionsPickerView mPiPicker;//政治面貌 + private OptionsPickerView mNationPicker;//民族 + private OptionsPickerView mNativePicker;//籍贯 + private OptionsPickerView mEduPicker;//学历 + private OptionsPickerView mWorkPicker;//从业状况 + private OptionsPickerView mSexPicker;//性别 + + private TimePickerView mDatePicker; + + private static final int TYPE_PI = 123; + private static final int TYPE_NATION = 223; + private static final int TYPE_NATIVE = 333; + private static final int TYPE_EDU = 433; + private static final int TYPE_WORK = 533; + private static final int TYPE_SEX = 888; + private BaseDictionaryBean mSelNationBean; + private BaseDictionaryBean mSelPiBean; + private BaseDictionaryBean mSelEduBean; + private BaseDictionaryBean mSelWork; + private BaseDictionaryBean mSelSex; + private String mSelGender; + + @Override + protected int setLayoutId() { + return R.layout.activity_new_mine_info_edit; + } + + + @Override + public void initData() { + super.initData(); + ButterKnife.bind(this); + mTvBaseTitle.setText("个人信息更新"); + refreshView(STATE_LOAD_LOADING); + mBtnConfirm.setOnClickListener(v -> doConfirm()); + mTvGender.setOnClickListener(v -> showDatePicker()); + mTvSex.setOnClickListener(v -> showSexPicker()); + mTvNation.setOnClickListener(v -> showNationPicker()); + mTvPolit.setOnClickListener(v -> showPiPicker()); + mTvDegree.setOnClickListener(v -> showEduPicker()); + mTvWork.setOnClickListener(v -> showWorkPicker()); + getUserInfo(); + } + + + /** + * 显示日期选择-年月日 + */ + private void showDatePicker() { + hideSoftKeyboard(); + Calendar startDate = Calendar.getInstance(); + mDatePicker = new TimePickerBuilder(this, (date, v) -> { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + String format1 = format.format(date); + mTvGender.setText(format1); + }).setDate(startDate) + .setContentTextSize(18) + .setType(new boolean[]{true, true, true, false, false, false}) + .setLabel("年", "月", "日", "时", "分", "秒") + .setLineSpacingMultiplier(1.2f) + .setTextXOffset(0, 0, 0, 40, 0, -40) + .isCenterLabel(false) + .build(); + mDatePicker.show(); + } + + + /** + * 从业状况 + */ + private void showWorkPicker() { + hideSoftKeyboard(); + if (mWorkList != null && mWorkList.size() > 0) { + mWorkPicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { + mSelWork = mWorkList.get(options1); + mTvWork.setText(mSelWork.getDataName()); + }).setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mWorkPicker.setPicker(mWorkList); + mWorkPicker.show(); + } else { + if (mWorkList == null) { + getDictionaryBeanList(PathConfig.DID_WORK, TYPE_WORK); + } else { + ToastUtils.showShort("暂无数据"); + } + } + } + + /** + * 性别 + */ + private void showSexPicker() { + hideSoftKeyboard(); + if (mSexList != null && mSexList.size() > 0) { + mSexPicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { + mSelSex = mSexList.get(options1); + mTvSex.setText(mSelSex.getDataName()); + }).setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mSexPicker.setPicker(mSexList); + mSexPicker.show(); + } else { + if (mSexList == null) { + getDictionaryBeanList(PathConfig.DID_SEX, TYPE_SEX); + } else { + ToastUtils.showShort("暂无数据"); + } + } + } + + /** + * 学历 + */ + private void showEduPicker() { + hideSoftKeyboard(); + if (mEduList != null && mEduList.size() > 0) { + mEduPicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { + mSelEduBean = mEduList.get(options1); + mTvDegree.setText(mSelEduBean.getDataName()); + }).setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mEduPicker.setPicker(mEduList); + mEduPicker.show(); + } else { + if (mEduList == null) { + getDictionaryBeanList(PathConfig.DID_EDU, TYPE_EDU); + } else { + ToastUtils.showShort("暂无数据"); + } + } + } + + + /** + * 政治面貌 + */ + private void showPiPicker() { + hideSoftKeyboard(); + if (mPiList != null && mPiList.size() > 0) { + mPiPicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { + mSelPiBean = mPiList.get(options1); + mTvPolit.setText(mSelPiBean.getDataName()); + }).setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mPiPicker.setPicker(mPiList); + mPiPicker.show(); + } else { + if (mPiList == null) { + getDictionaryBeanList(PathConfig.DID_PI, TYPE_PI); + } else { + ToastUtils.showShort("暂无数据"); + } + } + } + + /** + * 民族 + */ + private void showNationPicker() { + hideSoftKeyboard(); + if (mNationList != null && mNationList.size() > 0) { + mNationPicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { + mSelNationBean = mNationList.get(options1); + mTvNation.setText(mSelNationBean.getDataName()); + }).setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mNationPicker.setPicker(mNationList); + mNationPicker.show(); + } else { + if (mNationList == null) { + getDictionaryBeanList(PathConfig.DID_NATION, TYPE_NATION); + } else { + ToastUtils.showShort("暂无数据"); + } + } + } + + /** + * 籍贯 + */ + private void showNativePicker() { + hideSoftKeyboard(); + if (mNativeList != null && mNativeList.size() > 0) { + mNativePicker = new OptionsPickerBuilder(mActivity, (options1, options2, options3, v) -> { + + + }).setTitleText("请选择") + .setCancelColor(Color.parseColor("#1189FF")) + .setSubmitColor(Color.parseColor("#1189FF")) + .setTitleColor(Color.parseColor("#1189FF")) + .build(); + mNativePicker.setPicker(mNativeList); + mNativePicker.show(); + } else { + if (mNativeList == null) { + getDictionaryBeanList(PathConfig.DID_NATIVE, TYPE_NATIVE); + } else { + ToastUtils.showShort("暂无数据"); + } + } + } + + + /** + * 根据Id获取字典List + * + * @param pId + */ + private void getDictionaryBeanList(String pId, int type) { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "获取数据中..."); + dialog.show(); + RetrofitManager.getInstance() + .create(BaseApiService.class) + .getDicList(pId, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer>() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(List beans) { + dialog.dismiss(); + if (beans.size() > 0) { + switch (type) { + case TYPE_PI://政治面貌 + mPiList = beans; + showPiPicker(); + break; + case TYPE_EDU://学历 + mEduList = beans; + showEduPicker(); + break; + case TYPE_WORK://从业状况 + mWorkList = beans; + showWorkPicker(); + break; + case TYPE_NATIVE://籍贯 + mNativeList = beans; + showNativePicker(); + break; + case TYPE_NATION://民族 + mNationList = beans; + showNationPicker(); + break; + case TYPE_SEX: + mSexList = beans; + showSexPicker(); + break; + } + } else { + ToastUtils.showShort("暂无数据"); + } + } + + @Override + public void onError(Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + private RequestBody buildConfirmUserInfo() { + SaveUserInfoBean bean = new SaveUserInfoBean(); + String nickName = mEtNickName.getText().toString().trim(); + bean.setName(nickName); + String email = mEtEmail.getText().toString().trim(); + bean.setEmail(email); + String phone = mEtPhone.getText().toString().trim(); + bean.setPhone(phone); + String name = mEtName.getText().toString().trim(); + bean.setUserRealName(name); + if (mSelSex != null) { + bean.setUserSex(mSelSex.getDataId()); + } + String idCard = mEtIdCard.getText().toString().trim(); + bean.setUserIdCard(idCard); + String gender = mTvGender.getText().toString().trim(); + bean.setUserBirth(gender); + if (mSelNationBean != null) { + bean.setUserNation(mSelNationBean.getDataId()); + } + String nativeStr = mEtNative.getText().toString().trim(); + bean.setUserNative(nativeStr); + if (mSelPiBean != null) { + bean.setUserPoliticsStatus(mSelPiBean.getDataId()); + } + String qq = mEtQQ.getText().toString().trim(); + bean.setUserQq(qq); + String weixin = mEtWeixin.getText().toString().trim(); + bean.setUserWechat(weixin); + String weibo = mEtWeibo.getText().toString().trim(); + bean.setUserWeibo(weibo); + String currentAddress = mEtCurrentAddress.getText().toString().trim(); + bean.setUserLiveAddress(currentAddress); + String post = mEtPost.getText().toString().trim(); + bean.setUserZipCode(post); + String address = mEtAddress.getText().toString().trim(); + bean.setUserAddress(address); + if (mSelEduBean != null) { + bean.setUserEducation(mSelEduBean.getDataId()); + } + if (mSelWork != null) { + bean.setUserEmploymentSituation(mSelWork.getDataId()); + } + String content = mEtContent.getText().toString().trim(); + bean.setUserIntroduction(content); + Gson gson = new Gson(); + String obj = gson.toJson(bean); + RequestBody body = RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), obj); + return body; + } + + private void doConfirm() { + ProgressDialog dialog = UIUtil.initDialog(mActivity, "保存中..."); + dialog.show(); + RequestBody body = buildConfirmUserInfo(); + RetrofitManager.getInstance() + .create(BaseApiService.class) + .editUserInfo(UserLgUtils.getUserId(), body, UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(BaseSuccessBean baseSuccessBean) { + dialog.dismiss(); + ToastUtils.showShort("修改成功"); + setResult(13); + finish(); + } + + @Override + public void onError(Throwable e) { + dialog.dismiss(); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + + private void getUserInfo() { + RetrofitManager.getInstance() + .create(BaseApiService.class) + .getUserExpandInfo(UserLgUtils.getUserId(), UserLgUtils.getToken()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(new Observer() { + @Override + public void onSubscribe(Disposable d) { + + } + + @Override + public void onNext(UserExpandInfoBean userExpandInfoBean) { + setDataToView(userExpandInfoBean); + } + + @Override + public void onError(Throwable e) { + refreshView(STATE_LOAD_ERROR); + ExceptionHandler.handleException(e); + } + + @Override + public void onComplete() { + + } + }); + } + + + private void setDataToView(UserExpandInfoBean bean) { + refreshView(STATE_LOAD_SUCCESS); + mEtNickName.setText(bean.getUserName()); + mEtEmail.setText(bean.getUserEmail()); + mEtPhone.setText(bean.getUserPhone()); + mEtName.setText(bean.getUserRealName()); + if (!TextUtils.isEmpty(bean.getUserSex())) { + mSelSex = new BaseDictionaryBean(); + mSelSex.setDataId(bean.getUserSex()); + mSelSex.setDataName(bean.getUserSexName()); + } + mTvSex.setText(bean.getUserSexName()); + mTvGender.setText(bean.getUserBirth()); + mEtIdCard.setText(bean.getUserIdCard()); + if (!TextUtils.isEmpty(bean.getUserNation())) { + mSelNationBean = new BaseDictionaryBean(); + mSelNationBean.setDataId(bean.getUserNation()); + mSelNationBean.setDataName(bean.getUserNationName()); + } + mTvNation.setText(bean.getUserNationName()); + mEtNative.setText(bean.getUserNative()); + if (!TextUtils.isEmpty(bean.getUserPoliticsStatus())) { + mSelPiBean = new BaseDictionaryBean(); + mSelPiBean.setDataId(bean.getUserPoliticsStatus()); + mSelPiBean.setDataName(bean.getUserPoliticsStatusName()); + } + mTvPolit.setText(bean.getUserPoliticsStatusName()); + mEtQQ.setText(bean.getUserQq()); + mEtWeixin.setText(bean.getUserWechat()); + mEtWeibo.setText(bean.getUserWeibo()); + mEtCurrentAddress.setText(bean.getUserLiveAddress()); + mEtPost.setText(bean.getUserZipCode()); + mEtAddress.setText(bean.getUserAddress()); + if (!TextUtils.isEmpty(bean.getUserEducation())) { + mSelEduBean = new BaseDictionaryBean(); + mSelEduBean.setDataId(bean.getUserEducation()); + mSelEduBean.setDataName(bean.getUserEducationName()); + } + mTvDegree.setText(bean.getUserEducationName()); + if (!TextUtils.isEmpty(bean.getUserEmploymentSituation())) { + mSelWork = new BaseDictionaryBean(); + mSelWork.setDataId(bean.getUserEmploymentSituation()); + mSelWork.setDataName(bean.getUserEmploymentSituationName()); + } + mTvWork.setText(bean.getUserEmploymentSituationName()); + mEtContent.setText(bean.getUserIntroduction()); + } + +} \ No newline at end of file diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/SettingActivity.java b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/SettingActivity.java index c091cf3..4d95395 100755 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/activity/SettingActivity.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/activity/SettingActivity.java @@ -6,6 +6,8 @@ import android.text.TextUtils; import android.widget.LinearLayout; import android.widget.RelativeLayout; +import androidx.annotation.Nullable; + import com.alibaba.android.arouter.facade.annotation.Route; import com.alibaba.android.arouter.launcher.ARouter; import com.sucstepsoft.cm_utils.constant.PathConfig; @@ -25,11 +27,7 @@ import com.sucstepsoft.cm_utils.utils.UIUtil; import com.sucstepsoft.cm_utils.utils.UserLgUtils; import com.tengshisoft.modulemine.R; import com.tengshisoft.modulemine.R2; -import com.tengshisoft.mudulemain.cultural.activitys.base.MainActivity; -import org.aspectj.lang.annotation.Around; - -import androidx.annotation.Nullable; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; @@ -88,7 +86,7 @@ public class SettingActivity extends BaseActivity { .navigation(mActivity, 346); } else { ARouter.getInstance() - .build(PathConfig.PATH_MODULE_MINE_MINEINFO_DETAIL) + .build(PathConfig.PATH_MODULE_MINE_MINEINFO_DETAIL_NEW) .navigation(); } }); diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/fragments/MineMainFragment.java b/modulemine/src/main/java/com/tengshisoft/modulemine/fragments/MineMainFragment.java index 49ac68b..895c17f 100755 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/fragments/MineMainFragment.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/fragments/MineMainFragment.java @@ -26,7 +26,7 @@ import com.google.gson.Gson; import com.sucstepsoft.cm_utils.constant.PathConfig; import com.sucstepsoft.cm_utils.constant.PermissionConstants; import com.sucstepsoft.cm_utils.core.beans.BaseSuccessBean; -import com.sucstepsoft.cm_utils.core.beans.BaseUserInfoUpdateBean; +import com.sucstepsoft.cm_utils.core.beans.ChangeUserInfoBean; import com.sucstepsoft.cm_utils.core.beans.FuncBean; import com.sucstepsoft.cm_utils.core.retrofit_net.BaseUrlApi; import com.sucstepsoft.cm_utils.core.retrofit_net.RetrofitManager; @@ -36,6 +36,7 @@ import com.sucstepsoft.cm_utils.core.widget.base.BaseFragment; import com.sucstepsoft.cm_utils.core.widget.base.BaseFuncAdapter; import com.sucstepsoft.cm_utils.core.widget.views.ButtomDialogView; import com.sucstepsoft.cm_utils.core.widget.views.TypeFaceTextView; +import com.sucstepsoft.cm_utils.utils.ExceptionHandler; import com.sucstepsoft.cm_utils.utils.PermissionUtils; import com.sucstepsoft.cm_utils.utils.ProiderUtil; import com.sucstepsoft.cm_utils.utils.ToastUtils; @@ -298,7 +299,7 @@ public class MineMainFragment extends BaseFragment { @Override public void onNext(BaseSuccessBean baseUserBean) { - doUpdateAv(dialog, baseUserBean); + doUpdateAv(baseUserBean.getData(), dialog, baseUserBean); } @Override @@ -326,15 +327,15 @@ public class MineMainFragment extends BaseFragment { } - private void doUpdateAv(ProgressDialog dialog, BaseSuccessBean baseUserBean) { - BaseUserInfoUpdateBean bean = new BaseUserInfoUpdateBean(); - bean.setAvatar(baseUserBean.getData()); + private void doUpdateAv(String id, ProgressDialog dialog, BaseSuccessBean baseUserBean) { + ChangeUserInfoBean bean = new ChangeUserInfoBean(); + bean.setAvatar(id); Gson gson = new Gson(); - String s = gson.toJson(bean); - RequestBody body = RequestBody.create(okhttp3.MediaType.parse("application/json; charset=utf-8"), s); + String obj = gson.toJson(bean); + RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj); RetrofitManager.getInstance() .create(BaseApiService.class) - .doUpdateUserAvatar(body, UserLgUtils.getToken()) + .doChangeUserInfo(body, UserLgUtils.getToken()) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Observer() { @@ -344,18 +345,14 @@ public class MineMainFragment extends BaseFragment { } @Override - public void onNext(BaseSuccessBean baseSuccessBean) { - if (baseSuccessBean != null) { - getUserInfo(dialog, baseSuccessBean.getData()); - } else { - ToastUtils.showShort("修改失败,请稍后重试"); - } + public void onNext(@androidx.annotation.NonNull BaseSuccessBean successBean) { + getUserInfo(dialog, UserLgUtils.getToken()); } @Override - public void onError(Throwable e) { + public void onError(@androidx.annotation.NonNull Throwable e) { dialog.dismiss(); - ToastUtils.showShort("修改失败,请稍后重试"); + ExceptionHandler.handleException(e); } @Override diff --git a/modulemine/src/main/res/drawable/shp_rectangle_gray_df.xml b/modulemine/src/main/res/drawable/shp_rectangle_gray_df.xml new file mode 100755 index 0000000..d1bf6da --- /dev/null +++ b/modulemine/src/main/res/drawable/shp_rectangle_gray_df.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/modulemine/src/main/res/layout/activity_new_mine_info_edit.xml b/modulemine/src/main/res/layout/activity_new_mine_info_edit.xml new file mode 100644 index 0000000..0dfc5ea --- /dev/null +++ b/modulemine/src/main/res/layout/activity_new_mine_info_edit.xml @@ -0,0 +1,283 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modulemine/src/main/res/layout/activity_new_mine_infor_detail.xml b/modulemine/src/main/res/layout/activity_new_mine_infor_detail.xml new file mode 100644 index 0000000..f7d3067 --- /dev/null +++ b/modulemine/src/main/res/layout/activity_new_mine_infor_detail.xml @@ -0,0 +1,266 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/modulemine/src/main/res/values/styles.xml b/modulemine/src/main/res/values/styles.xml index 836064d..ee8b5ec 100755 --- a/modulemine/src/main/res/values/styles.xml +++ b/modulemine/src/main/res/values/styles.xml @@ -11,4 +11,5 @@ true true + \ No newline at end of file