From d7ff801372431e64aee8f68ece4b8532cffb2207 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 02 七月 2024 18:32:49 +0800
Subject: [PATCH] 2024年07月02日18:32:40
---
app/src/main/res/layout/fragment_me.xml | 4 ++--
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java | 6 +++++-
app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java | 2 +-
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java | 1 +
app/src/main/java/com/hdl/photovoltaic/ui/bean/BUserInfo.java | 20 ++++++++++++++++++++
app/src/main/res/drawable/next.png | 0
6 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java b/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
index 16c33e5..b520a70 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
@@ -119,7 +119,7 @@
//鑾峰彇鐢ㄦ埛璇︽儏淇℃伅
- public static final String B_POST_GET_USERINFO = "/basis-footstone/mgmt/user/oauth/getUserInfo";
+ public static final String B_POST_GET_USERINFO = "/basis-user/mgmt/user/manage/info";//"/basis-footstone/mgmt/user/oauth/getUserInfo";
//鑱旂郴鎴戜滑
public static final String B_POST_GET_UTIL_CONTACT = "/home-wisdom/app/powerStation/util/contact";
//鑾峰彇褰撳墠璐﹀彿鍦ㄥ叕鍙哥殑韬唤
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
index 37b9012..9912143 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -222,6 +222,7 @@
public void getUserInfo_B(CloudCallBeak<BUserInfo> cloudCallBeak) {
String requestUrl = HttpApi.B_POST_GET_USERINFO;
JsonObject json = new JsonObject();
+ json.addProperty("userId",UserConfigManage.getInstance().getUserId());
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
public void onSuccess(String jsonStr) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/BUserInfo.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/BUserInfo.java
index 3a3a55a..f468eb7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/BUserInfo.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/BUserInfo.java
@@ -11,6 +11,25 @@
private String companyId;//鍏徃id
private String companyName;//鍏徃鍚嶇О
+ private String userPhone;
+ private String userEmail;
+
+ public String getUserPhone() {
+ return userPhone == null ? "" : userPhone;
+ }
+
+ public void setUserPhone(String userPhone) {
+ this.userPhone = userPhone;
+ }
+
+ public String getUserEmail() {
+ return userEmail == null ? "" : userEmail;
+ }
+
+ public void setUserEmail(String userEmail) {
+ this.userEmail = userEmail;
+ }
+
public String getUserId() {
return userId == null ? "" : userId;
}
@@ -21,6 +40,7 @@
/**
* 鐢ㄦ埛鍚嶇О
+ *
* @return -
*/
public String getUserName() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
index 40f0b63..338dc5d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -144,7 +144,11 @@
HdlAccountLogic.getInstance().getUserInfo_B(new CloudCallBeak<BUserInfo>() {
@Override
public void onSuccess(BUserInfo bUserInfo) {
+
mB_UserInfo = bUserInfo;
+ UserConfigManage.getInstance().setBingPhone(bUserInfo.getUserPhone());
+ UserConfigManage.getInstance().setBingEmail(bUserInfo.getUserEmail());
+ UserConfigManage.getInstance().Save();
// hideLoading();
setMemberName(bUserInfo.getUserName());
}
@@ -281,7 +285,7 @@
*/
private void setMemberName(String userName) {
if (TextUtils.isEmpty(userName)) {
- return;
+ userName = "--";
}
viewBinding.fragmentMeUserNameTv.setText(userName);
UserConfigManage.getInstance().setUserName(userName);
diff --git a/app/src/main/res/drawable/next.png b/app/src/main/res/drawable/next.png
index 269a1db..ca6d8a3 100644
--- a/app/src/main/res/drawable/next.png
+++ b/app/src/main/res/drawable/next.png
Binary files differ
diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml
index a7bc4fb..aa3b0da 100644
--- a/app/src/main/res/layout/fragment_me.xml
+++ b/app/src/main/res/layout/fragment_me.xml
@@ -52,10 +52,10 @@
android:layout_width="7dp"
android:layout_height="@dimen/dp_12"
android:layout_marginStart="@dimen/text_15"
- android:layout_marginTop="@dimen/dp_21"
android:src="@drawable/next"
+ app:layout_constraintBottom_toBottomOf="@+id/fragment_me_user_name_tv"
app:layout_constraintStart_toEndOf="@+id/fragment_me_user_name_tv"
- app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_iv" />
+ app:layout_constraintTop_toTopOf="@+id/fragment_me_user_name_tv" />
<TextView
android:id="@+id/fragment_me_user_role_tv"
--
Gitblit v1.8.0