diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index 78661ee..6d69b72 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -48,6 +48,21 @@ }).build().show() } } + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + bv.userNameView.text = it.data.name + + val userRoleBuilder = StringBuilder() + it.data.roleNames.forEachIndexed { index, role -> + if (index == it.data.roleNames.size - 1) { + userRoleBuilder.append(role) + } else { + userRoleBuilder.append(role).append(",") + } + } + bv.userRoleView.text = userRoleBuilder.toString() + } + } } override fun initEvent() { @@ -104,4 +119,9 @@ override fun setupTopBarLayout() { } + + override fun onResume() { + super.onResume() + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index 78661ee..6d69b72 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -48,6 +48,21 @@ }).build().show() } } + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + bv.userNameView.text = it.data.name + + val userRoleBuilder = StringBuilder() + it.data.roleNames.forEachIndexed { index, role -> + if (index == it.data.roleNames.size - 1) { + userRoleBuilder.append(role) + } else { + userRoleBuilder.append(role).append(",") + } + } + bv.userRoleView.text = userRoleBuilder.toString() + } + } } override fun initEvent() { @@ -104,4 +119,9 @@ override fun setupTopBarLayout() { } + + override fun onResume() { + super.onResume() + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java b/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java new file mode 100644 index 0000000..3207410 --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java @@ -0,0 +1,262 @@ +package com.casic.br.ktd.model; + +import java.util.List; + +public class UserInfoModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private String account; + private String appId; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private boolean isAppLogin; + private String name; + private String phone; + private List resourceUrls; + private List roleIds; + private List roleNames; + private List roleTips; + private String scopeType; + private String syncId; + private String syncName; + private String sysData; + private String tenantId; + private String userUniqueId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public boolean isIsAppLogin() { + return isAppLogin; + } + + public void setIsAppLogin(boolean isAppLogin) { + this.isAppLogin = isAppLogin; + } + + 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; + } + + public List getResourceUrls() { + return resourceUrls; + } + + public void setResourceUrls(List resourceUrls) { + this.resourceUrls = resourceUrls; + } + + public List getRoleIds() { + return roleIds; + } + + public void setRoleIds(List roleIds) { + this.roleIds = roleIds; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSyncId() { + return syncId; + } + + public void setSyncId(String syncId) { + this.syncId = syncId; + } + + public String getSyncName() { + return syncName; + } + + public void setSyncName(String syncName) { + this.syncName = syncName; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public String getUserUniqueId() { + return userUniqueId; + } + + public void setUserUniqueId(String userUniqueId) { + this.userUniqueId = userUniqueId; + } + } +} diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index 78661ee..6d69b72 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -48,6 +48,21 @@ }).build().show() } } + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + bv.userNameView.text = it.data.name + + val userRoleBuilder = StringBuilder() + it.data.roleNames.forEachIndexed { index, role -> + if (index == it.data.roleNames.size - 1) { + userRoleBuilder.append(role) + } else { + userRoleBuilder.append(role).append(",") + } + } + bv.userRoleView.text = userRoleBuilder.toString() + } + } } override fun initEvent() { @@ -104,4 +119,9 @@ override fun setupTopBarLayout() { } + + override fun onResume() { + super.onResume() + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java b/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java new file mode 100644 index 0000000..3207410 --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java @@ -0,0 +1,262 @@ +package com.casic.br.ktd.model; + +import java.util.List; + +public class UserInfoModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private String account; + private String appId; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private boolean isAppLogin; + private String name; + private String phone; + private List resourceUrls; + private List roleIds; + private List roleNames; + private List roleTips; + private String scopeType; + private String syncId; + private String syncName; + private String sysData; + private String tenantId; + private String userUniqueId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public boolean isIsAppLogin() { + return isAppLogin; + } + + public void setIsAppLogin(boolean isAppLogin) { + this.isAppLogin = isAppLogin; + } + + 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; + } + + public List getResourceUrls() { + return resourceUrls; + } + + public void setResourceUrls(List resourceUrls) { + this.resourceUrls = resourceUrls; + } + + public List getRoleIds() { + return roleIds; + } + + public void setRoleIds(List roleIds) { + this.roleIds = roleIds; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSyncId() { + return syncId; + } + + public void setSyncId(String syncId) { + this.syncId = syncId; + } + + public String getSyncName() { + return syncName; + } + + public void setSyncName(String syncName) { + this.syncName = syncName; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public String getUserUniqueId() { + return userUniqueId; + } + + public void setUserUniqueId(String userUniqueId) { + this.userUniqueId = userUniqueId; + } + } +} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index d3548bb..726b4e9 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -1,10 +1,7 @@ package com.casic.br.ktd.retrofit import okhttp3.RequestBody -import retrofit2.http.Body -import retrofit2.http.GET -import retrofit2.http.Header -import retrofit2.http.POST +import retrofit2.http.* interface RetrofitService { /** @@ -26,6 +23,15 @@ suspend fun loginOut(@Header("token") token: String): String /** + * 获取用户信息 + */ + @GET("/sys/user/info") + suspend fun getUserInfo( + @Header("token") token: String, + @Query("account") account: String + ): String + + /** * 修改密码 */ @POST("/sys/mgr/changePwd") diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index 78661ee..6d69b72 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -48,6 +48,21 @@ }).build().show() } } + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + bv.userNameView.text = it.data.name + + val userRoleBuilder = StringBuilder() + it.data.roleNames.forEachIndexed { index, role -> + if (index == it.data.roleNames.size - 1) { + userRoleBuilder.append(role) + } else { + userRoleBuilder.append(role).append(",") + } + } + bv.userRoleView.text = userRoleBuilder.toString() + } + } } override fun initEvent() { @@ -104,4 +119,9 @@ override fun setupTopBarLayout() { } + + override fun onResume() { + super.onResume() + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java b/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java new file mode 100644 index 0000000..3207410 --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java @@ -0,0 +1,262 @@ +package com.casic.br.ktd.model; + +import java.util.List; + +public class UserInfoModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private String account; + private String appId; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private boolean isAppLogin; + private String name; + private String phone; + private List resourceUrls; + private List roleIds; + private List roleNames; + private List roleTips; + private String scopeType; + private String syncId; + private String syncName; + private String sysData; + private String tenantId; + private String userUniqueId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public boolean isIsAppLogin() { + return isAppLogin; + } + + public void setIsAppLogin(boolean isAppLogin) { + this.isAppLogin = isAppLogin; + } + + 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; + } + + public List getResourceUrls() { + return resourceUrls; + } + + public void setResourceUrls(List resourceUrls) { + this.resourceUrls = resourceUrls; + } + + public List getRoleIds() { + return roleIds; + } + + public void setRoleIds(List roleIds) { + this.roleIds = roleIds; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSyncId() { + return syncId; + } + + public void setSyncId(String syncId) { + this.syncId = syncId; + } + + public String getSyncName() { + return syncName; + } + + public void setSyncName(String syncName) { + this.syncName = syncName; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public String getUserUniqueId() { + return userUniqueId; + } + + public void setUserUniqueId(String userUniqueId) { + this.userUniqueId = userUniqueId; + } + } +} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index d3548bb..726b4e9 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -1,10 +1,7 @@ package com.casic.br.ktd.retrofit import okhttp3.RequestBody -import retrofit2.http.Body -import retrofit2.http.GET -import retrofit2.http.Header -import retrofit2.http.POST +import retrofit2.http.* interface RetrofitService { /** @@ -26,6 +23,15 @@ suspend fun loginOut(@Header("token") token: String): String /** + * 获取用户信息 + */ + @GET("/sys/user/info") + suspend fun getUserInfo( + @Header("token") token: String, + @Query("account") account: String + ): String + + /** * 修改密码 */ @POST("/sys/mgr/changePwd") diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 073260a..5e35a4c 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -61,6 +61,13 @@ } /** + * 获取用户信息 + */ + suspend fun getUserInfo(account: String): String { + return api.getUserInfo(AuthenticationHelper.token, account) + } + + /** * 获取任务列表 */ suspend fun getTaskList( diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index 78661ee..6d69b72 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -48,6 +48,21 @@ }).build().show() } } + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + bv.userNameView.text = it.data.name + + val userRoleBuilder = StringBuilder() + it.data.roleNames.forEachIndexed { index, role -> + if (index == it.data.roleNames.size - 1) { + userRoleBuilder.append(role) + } else { + userRoleBuilder.append(role).append(",") + } + } + bv.userRoleView.text = userRoleBuilder.toString() + } + } } override fun initEvent() { @@ -104,4 +119,9 @@ override fun setupTopBarLayout() { } + + override fun onResume() { + super.onResume() + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java b/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java new file mode 100644 index 0000000..3207410 --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java @@ -0,0 +1,262 @@ +package com.casic.br.ktd.model; + +import java.util.List; + +public class UserInfoModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private String account; + private String appId; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private boolean isAppLogin; + private String name; + private String phone; + private List resourceUrls; + private List roleIds; + private List roleNames; + private List roleTips; + private String scopeType; + private String syncId; + private String syncName; + private String sysData; + private String tenantId; + private String userUniqueId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public boolean isIsAppLogin() { + return isAppLogin; + } + + public void setIsAppLogin(boolean isAppLogin) { + this.isAppLogin = isAppLogin; + } + + 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; + } + + public List getResourceUrls() { + return resourceUrls; + } + + public void setResourceUrls(List resourceUrls) { + this.resourceUrls = resourceUrls; + } + + public List getRoleIds() { + return roleIds; + } + + public void setRoleIds(List roleIds) { + this.roleIds = roleIds; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSyncId() { + return syncId; + } + + public void setSyncId(String syncId) { + this.syncId = syncId; + } + + public String getSyncName() { + return syncName; + } + + public void setSyncName(String syncName) { + this.syncName = syncName; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public String getUserUniqueId() { + return userUniqueId; + } + + public void setUserUniqueId(String userUniqueId) { + this.userUniqueId = userUniqueId; + } + } +} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index d3548bb..726b4e9 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -1,10 +1,7 @@ package com.casic.br.ktd.retrofit import okhttp3.RequestBody -import retrofit2.http.Body -import retrofit2.http.GET -import retrofit2.http.Header -import retrofit2.http.POST +import retrofit2.http.* interface RetrofitService { /** @@ -26,6 +23,15 @@ suspend fun loginOut(@Header("token") token: String): String /** + * 获取用户信息 + */ + @GET("/sys/user/info") + suspend fun getUserInfo( + @Header("token") token: String, + @Query("account") account: String + ): String + + /** * 修改密码 */ @POST("/sys/mgr/changePwd") diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 073260a..5e35a4c 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -61,6 +61,13 @@ } /** + * 获取用户信息 + */ + suspend fun getUserInfo(account: String): String { + return api.getUserInfo(AuthenticationHelper.token, account) + } + + /** * 获取任务列表 */ suspend fun getTaskList( diff --git a/app/src/main/java/com/casic/br/ktd/vm/UserViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/UserViewModel.kt index 6683c20..5112b76 100644 --- a/app/src/main/java/com/casic/br/ktd/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/br/ktd/vm/UserViewModel.kt @@ -6,6 +6,7 @@ import com.casic.br.ktd.extensions.toErrorMessage import com.casic.br.ktd.model.ActionResultModel import com.casic.br.ktd.model.LoginResultModel +import com.casic.br.ktd.model.UserInfoModel import com.casic.br.ktd.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,10 +21,10 @@ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val loginResult = MutableLiveData() val outResult = MutableLiveData() val changePwdResult = MutableLiveData() + val userInfo = MutableLiveData() fun enter(sid: String, account: String, secretKey: String) = launch({ loadState.value = LoadState.Loading @@ -74,4 +75,16 @@ loadState.value = LoadState.Fail it.printStackTrace() }) + + fun getUserInfo(account: String) = launch({ + val response = RetrofitServiceManager.getUserInfo(account) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + userInfo.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } + }, { + it.printStackTrace() + }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index 78661ee..6d69b72 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -48,6 +48,21 @@ }).build().show() } } + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + bv.userNameView.text = it.data.name + + val userRoleBuilder = StringBuilder() + it.data.roleNames.forEachIndexed { index, role -> + if (index == it.data.roleNames.size - 1) { + userRoleBuilder.append(role) + } else { + userRoleBuilder.append(role).append(",") + } + } + bv.userRoleView.text = userRoleBuilder.toString() + } + } } override fun initEvent() { @@ -104,4 +119,9 @@ override fun setupTopBarLayout() { } + + override fun onResume() { + super.onResume() + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java b/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java new file mode 100644 index 0000000..3207410 --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java @@ -0,0 +1,262 @@ +package com.casic.br.ktd.model; + +import java.util.List; + +public class UserInfoModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private String account; + private String appId; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private boolean isAppLogin; + private String name; + private String phone; + private List resourceUrls; + private List roleIds; + private List roleNames; + private List roleTips; + private String scopeType; + private String syncId; + private String syncName; + private String sysData; + private String tenantId; + private String userUniqueId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public boolean isIsAppLogin() { + return isAppLogin; + } + + public void setIsAppLogin(boolean isAppLogin) { + this.isAppLogin = isAppLogin; + } + + 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; + } + + public List getResourceUrls() { + return resourceUrls; + } + + public void setResourceUrls(List resourceUrls) { + this.resourceUrls = resourceUrls; + } + + public List getRoleIds() { + return roleIds; + } + + public void setRoleIds(List roleIds) { + this.roleIds = roleIds; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSyncId() { + return syncId; + } + + public void setSyncId(String syncId) { + this.syncId = syncId; + } + + public String getSyncName() { + return syncName; + } + + public void setSyncName(String syncName) { + this.syncName = syncName; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public String getUserUniqueId() { + return userUniqueId; + } + + public void setUserUniqueId(String userUniqueId) { + this.userUniqueId = userUniqueId; + } + } +} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index d3548bb..726b4e9 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -1,10 +1,7 @@ package com.casic.br.ktd.retrofit import okhttp3.RequestBody -import retrofit2.http.Body -import retrofit2.http.GET -import retrofit2.http.Header -import retrofit2.http.POST +import retrofit2.http.* interface RetrofitService { /** @@ -26,6 +23,15 @@ suspend fun loginOut(@Header("token") token: String): String /** + * 获取用户信息 + */ + @GET("/sys/user/info") + suspend fun getUserInfo( + @Header("token") token: String, + @Query("account") account: String + ): String + + /** * 修改密码 */ @POST("/sys/mgr/changePwd") diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 073260a..5e35a4c 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -61,6 +61,13 @@ } /** + * 获取用户信息 + */ + suspend fun getUserInfo(account: String): String { + return api.getUserInfo(AuthenticationHelper.token, account) + } + + /** * 获取任务列表 */ suspend fun getTaskList( diff --git a/app/src/main/java/com/casic/br/ktd/vm/UserViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/UserViewModel.kt index 6683c20..5112b76 100644 --- a/app/src/main/java/com/casic/br/ktd/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/br/ktd/vm/UserViewModel.kt @@ -6,6 +6,7 @@ import com.casic.br.ktd.extensions.toErrorMessage import com.casic.br.ktd.model.ActionResultModel import com.casic.br.ktd.model.LoginResultModel +import com.casic.br.ktd.model.UserInfoModel import com.casic.br.ktd.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,10 +21,10 @@ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val loginResult = MutableLiveData() val outResult = MutableLiveData() val changePwdResult = MutableLiveData() + val userInfo = MutableLiveData() fun enter(sid: String, account: String, secretKey: String) = launch({ loadState.value = LoadState.Loading @@ -74,4 +75,16 @@ loadState.value = LoadState.Fail it.printStackTrace() }) + + fun getUserInfo(account: String) = launch({ + val response = RetrofitServiceManager.getUserInfo(account) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + userInfo.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } + }, { + it.printStackTrace() + }) } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index d4f01db..9c7e2e4 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -35,11 +35,11 @@ android:src="@mipmap/default_avatar" /> @@ -121,13 +121,13 @@ android:textSize="@dimen/sp_16" /> diff --git a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt index 78661ee..6d69b72 100644 --- a/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/br/ktd/fragment/MinePageFragment.kt @@ -48,6 +48,21 @@ }).build().show() } } + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + bv.userNameView.text = it.data.name + + val userRoleBuilder = StringBuilder() + it.data.roleNames.forEachIndexed { index, role -> + if (index == it.data.roleNames.size - 1) { + userRoleBuilder.append(role) + } else { + userRoleBuilder.append(role).append(",") + } + } + bv.userRoleView.text = userRoleBuilder.toString() + } + } } override fun initEvent() { @@ -104,4 +119,9 @@ override fun setupTopBarLayout() { } + + override fun onResume() { + super.onResume() + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java b/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java new file mode 100644 index 0000000..3207410 --- /dev/null +++ b/app/src/main/java/com/casic/br/ktd/model/UserInfoModel.java @@ -0,0 +1,262 @@ +package com.casic.br.ktd.model; + +import java.util.List; + +public class UserInfoModel { + + private int code; + private DataModel data; + private String message; + private boolean success; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } + + public static class DataModel { + private String account; + private String appId; + private String attr1; + private String avatar; + private String bizData; + private List dataScope; + private String deptId; + private String deptName; + private List devices; + private String id; + private String ipAddr; + private boolean isAppLogin; + private String name; + private String phone; + private List resourceUrls; + private List roleIds; + private List roleNames; + private List roleTips; + private String scopeType; + private String syncId; + private String syncName; + private String sysData; + private String tenantId; + private String userUniqueId; + + public String getAccount() { + return account; + } + + public void setAccount(String account) { + this.account = account; + } + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAvatar() { + return avatar; + } + + public void setAvatar(String avatar) { + this.avatar = avatar; + } + + public String getBizData() { + return bizData; + } + + public void setBizData(String bizData) { + this.bizData = bizData; + } + + public List getDataScope() { + return dataScope; + } + + public void setDataScope(List dataScope) { + this.dataScope = dataScope; + } + + public String getDeptId() { + return deptId; + } + + public void setDeptId(String deptId) { + this.deptId = deptId; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public List getDevices() { + return devices; + } + + public void setDevices(List devices) { + this.devices = devices; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIpAddr() { + return ipAddr; + } + + public void setIpAddr(String ipAddr) { + this.ipAddr = ipAddr; + } + + public boolean isIsAppLogin() { + return isAppLogin; + } + + public void setIsAppLogin(boolean isAppLogin) { + this.isAppLogin = isAppLogin; + } + + 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; + } + + public List getResourceUrls() { + return resourceUrls; + } + + public void setResourceUrls(List resourceUrls) { + this.resourceUrls = resourceUrls; + } + + public List getRoleIds() { + return roleIds; + } + + public void setRoleIds(List roleIds) { + this.roleIds = roleIds; + } + + public List getRoleNames() { + return roleNames; + } + + public void setRoleNames(List roleNames) { + this.roleNames = roleNames; + } + + public List getRoleTips() { + return roleTips; + } + + public void setRoleTips(List roleTips) { + this.roleTips = roleTips; + } + + public String getScopeType() { + return scopeType; + } + + public void setScopeType(String scopeType) { + this.scopeType = scopeType; + } + + public String getSyncId() { + return syncId; + } + + public void setSyncId(String syncId) { + this.syncId = syncId; + } + + public String getSyncName() { + return syncName; + } + + public void setSyncName(String syncName) { + this.syncName = syncName; + } + + public String getSysData() { + return sysData; + } + + public void setSysData(String sysData) { + this.sysData = sysData; + } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + public String getUserUniqueId() { + return userUniqueId; + } + + public void setUserUniqueId(String userUniqueId) { + this.userUniqueId = userUniqueId; + } + } +} diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt index d3548bb..726b4e9 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitService.kt @@ -1,10 +1,7 @@ package com.casic.br.ktd.retrofit import okhttp3.RequestBody -import retrofit2.http.Body -import retrofit2.http.GET -import retrofit2.http.Header -import retrofit2.http.POST +import retrofit2.http.* interface RetrofitService { /** @@ -26,6 +23,15 @@ suspend fun loginOut(@Header("token") token: String): String /** + * 获取用户信息 + */ + @GET("/sys/user/info") + suspend fun getUserInfo( + @Header("token") token: String, + @Query("account") account: String + ): String + + /** * 修改密码 */ @POST("/sys/mgr/changePwd") diff --git a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt index 073260a..5e35a4c 100644 --- a/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/ktd/retrofit/RetrofitServiceManager.kt @@ -61,6 +61,13 @@ } /** + * 获取用户信息 + */ + suspend fun getUserInfo(account: String): String { + return api.getUserInfo(AuthenticationHelper.token, account) + } + + /** * 获取任务列表 */ suspend fun getTaskList( diff --git a/app/src/main/java/com/casic/br/ktd/vm/UserViewModel.kt b/app/src/main/java/com/casic/br/ktd/vm/UserViewModel.kt index 6683c20..5112b76 100644 --- a/app/src/main/java/com/casic/br/ktd/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/br/ktd/vm/UserViewModel.kt @@ -6,6 +6,7 @@ import com.casic.br.ktd.extensions.toErrorMessage import com.casic.br.ktd.model.ActionResultModel import com.casic.br.ktd.model.LoginResultModel +import com.casic.br.ktd.model.UserInfoModel import com.casic.br.ktd.retrofit.RetrofitServiceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -20,10 +21,10 @@ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val loginResult = MutableLiveData() val outResult = MutableLiveData() val changePwdResult = MutableLiveData() + val userInfo = MutableLiveData() fun enter(sid: String, account: String, secretKey: String) = launch({ loadState.value = LoadState.Loading @@ -74,4 +75,16 @@ loadState.value = LoadState.Fail it.printStackTrace() }) + + fun getUserInfo(account: String) = launch({ + val response = RetrofitServiceManager.getUserInfo(account) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + userInfo.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } + }, { + it.printStackTrace() + }) } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index d4f01db..9c7e2e4 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -35,11 +35,11 @@ android:src="@mipmap/default_avatar" /> @@ -121,13 +121,13 @@ android:textSize="@dimen/sp_16" /> diff --git a/cosmocalendar/build.gradle b/cosmocalendar/build.gradle index 5273585..d341abd 100644 --- a/cosmocalendar/build.gradle +++ b/cosmocalendar/build.gradle @@ -48,4 +48,4 @@ } // Place it at the end of the file -apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' \ No newline at end of file +//apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' \ No newline at end of file