diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
index d84ae5b55..0ff97cd02 100644
--- a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
+++ b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
@@ -82,16 +82,16 @@ public class AddUserInfoFragment extends BaseFragment
gender = -1;
okBtn.setOnClickListener(this);
tvRandomNick.setOnClickListener(this);
- addWXUserInfo();
+ addUserInfo();
addInviteCodeInfo();
InitialModel.get().init(false);
}
- private void addWXUserInfo() {
+ private void addUserInfo() {
ThirdUserInfo thirdUserInfo = AuthModel.get().getThirdUserInfo();
if (thirdUserInfo != null) {
- if (thirdUserInfo.getType() == ThirdUserInfo.TYPE_WX || thirdUserInfo.getType() == ThirdUserInfo.TYPE_QQ) {
+ if (thirdUserInfo.getType() == ThirdUserInfo.TYPE_FACEBOOK || thirdUserInfo.getType() == ThirdUserInfo.TYPE_LINE || thirdUserInfo.getType() == ThirdUserInfo.TYPE_GOOGLE) {
avatarUrl = TextUtils.isEmpty(thirdUserInfo.getUserIcon()) ? avatarUrl : thirdUserInfo.getUserIcon();
String str_gender = thirdUserInfo.getUserGender() == null ? "" : thirdUserInfo.getUserGender();
gender = str_gender.equals("m") ? UserInfo.GENDER_MALE : UserInfo.GENDER_FEMALE;
diff --git a/app/src/main/res/layout/fragment_add_user_info.xml b/app/src/main/res/layout/fragment_add_user_info.xml
index 4c78171fa..0da9c70b6 100644
--- a/app/src/main/res/layout/fragment_add_user_info.xml
+++ b/app/src/main/res/layout/fragment_add_user_info.xml
@@ -138,6 +138,7 @@
android:lines="1"
android:maxLength="8"
android:paddingStart="@dimen/dp_9"
+ android:paddingEnd="0dp"
android:singleLine="true"
android:text="@string/text_default_nick"
android:textColor="@color/text_title_color"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e94581001..2164119e6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -666,7 +666,7 @@
KTV中…
加載中…
- 我是一只小萌新
+ Peko小新
(選填)
排麥模式
@@ -2951,7 +2951,7 @@
金豆
人名長度要限製在十個字以內
領取12/14個,剩余12.600金豆
- 我是一只小萌新
+ Peko小新
請輸入當前登錄密碼
原密碼
請輸入新的登錄密碼
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java
index 10457cdf6..6de9eb357 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java
@@ -363,6 +363,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
String unionid = platform.getDb().get("unionid");
Logger.i(platform.getDb().getUserGender() + "----openid" + openid + "unionid" + unionid + platform.getDb().getUserIcon());
thirdUserInfo = new ThirdUserInfo();
+ thirdUserInfo.setType(ThirdUserInfo.TYPE_FACEBOOK);
thirdUserInfo.setPlatform("Facebook");
thirdUserInfo.setUserName(platform.getDb().getUserName());
thirdUserInfo.setUserGender(platform.getDb().getUserGender());
@@ -434,6 +435,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
Logger.i("openid:" + openid + " unionid:" + unionid + platform.getDb().getUserIcon());
thirdUserInfo = new ThirdUserInfo();
+ thirdUserInfo.setType(ThirdUserInfo.TYPE_LINE);
thirdUserInfo.setPlatform("LINE");
thirdUserInfo.setUserName(platform.getDb().getUserName());
thirdUserInfo.setUserGender(platform.getDb().getUserGender());
@@ -504,6 +506,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
Logger.i("openid:" + openid + " unionid:" + unionid + platform.getDb().getUserIcon());
thirdUserInfo = new ThirdUserInfo();
+ thirdUserInfo.setType(ThirdUserInfo.TYPE_GOOGLE);
thirdUserInfo.setPlatform("Google");
thirdUserInfo.setUserName(platform.getDb().getUserName());
thirdUserInfo.setUserGender(platform.getDb().getUserGender());
diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/ThirdUserInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/ThirdUserInfo.java
index 491e6e933..6d68d6e7f 100644
--- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/ThirdUserInfo.java
+++ b/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/ThirdUserInfo.java
@@ -14,9 +14,9 @@ public class ThirdUserInfo implements Serializable {
private long birth;
private int type;
- public static final int TYPE_WX = 1;
- public static final int TYPE_QQ = 2;
- public static final int TYPE_ONEKEY = 3;
+ public static final int TYPE_FACEBOOK = 1;
+ public static final int TYPE_LINE = 2;
+ public static final int TYPE_GOOGLE = 3;
public int getType() {
return type;