From 1a0aaa0bd03b3a491c751b5ce1bfca16302767b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 19 六月 2024 19:30:12 +0800
Subject: [PATCH] 2024年06月19日19:30:03
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/MemberBean.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/MemberBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/MemberBean.java
index ab1a19a..2b8fb04 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/MemberBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/MemberBean.java
@@ -1,5 +1,7 @@
package com.hdl.photovoltaic.ui.bean;
+import android.text.TextUtils;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -9,8 +11,8 @@
*/
public class MemberBean implements Serializable {
+
private String id;//涓婚敭
- private String account;//瀛愮敤鎴� phone 鎴栬�� email
private String childAccountType;//瀛愯处鎴风被鍨�(ORDINARY 锛氭櫘閫氭垚鍛�,DEBUG 锛� 璋冭瘯浜哄憳,ADMIN 锛� 绠＄悊鍛�,VIEW : 浠呮煡鐪�)
private String childAccountId;//瀛愯处鍙穒d
@@ -30,6 +32,62 @@
private int isDelete;//isDelete 0:鏈垹闄� 1:鍒犻櫎
private List<String> privileges = new ArrayList<>();//鏉冮檺
+
+ private String childAccountPhone;//鎵嬫満鍙�
+ private String childAccountEmail;//閭
+ private String childAccountRegionUrl;
+ private String memberHeadIcon;
+ private String memberName;
+
+ private String userFaceUrl;//浜鸿劯鍥剧墖
+
+ public String getUserFaceUrl() {
+ return userFaceUrl== null ? "" : userFaceUrl;
+ }
+
+ public void setUserFaceUrl(String userFaceUrl) {
+ this.userFaceUrl = userFaceUrl;
+ }
+
+ public String getChildAccountPhone() {
+ return childAccountPhone == null ? "" : childAccountPhone;
+ }
+
+ public void setChildAccountPhone(String childAccountPhone) {
+ this.childAccountPhone = childAccountPhone;
+ }
+
+ public String getChildAccountEmail() {
+ return childAccountEmail == null ? "" : childAccountEmail;
+ }
+
+ public void setChildAccountEmail(String childAccountEmail) {
+ this.childAccountEmail = childAccountEmail;
+ }
+
+ public String getChildAccountRegionUrl() {
+ return childAccountRegionUrl == null ? "" : childAccountRegionUrl;
+ }
+
+ public void setChildAccountRegionUrl(String childAccountRegionUrl) {
+ this.childAccountRegionUrl = childAccountRegionUrl;
+ }
+
+ public String getMemberHeadIcon() {
+ return memberHeadIcon == null ? "" : memberHeadIcon;
+ }
+
+ public void setMemberHeadIcon(String memberHeadIcon) {
+ this.memberHeadIcon = memberHeadIcon;
+ }
+
+ public String getMemberName() {
+ return memberName == null ? "" : memberName;
+ }
+
+ public void setMemberName(String memberName) {
+ this.memberName = memberName;
+ }
public int getIsDelete() {
return isDelete;
@@ -136,12 +194,9 @@
}
public String getAccount() {
- return account == null ? "" : account;
+ return TextUtils.isEmpty(getChildAccountPhone()) ? getChildAccountEmail() : getChildAccountPhone();
}
- public void setAccount(String account) {
- this.account = account;
- }
public String getChildAccountType() {
return childAccountType == null ? "" : childAccountType;
--
Gitblit v1.8.0