diff --git a/app/build.gradle b/app/build.gradle index 47edb017b..d6de25772 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -133,7 +133,7 @@ android { release { // buildConfigField "String", "BASE_URL", "\"https://www.erbanyy.com/\"" - buildConfigField "String", "BASE_URL", "\"https://api.qxjiaoyou.com/\"" + buildConfigField "String", "BASE_URL", "\"https://api.zhongjialx.com/\"" buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL" buildConfigField "String", "BASE_URL_STAGING", "BASE_URL" buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL" @@ -161,7 +161,7 @@ android { // buildConfigField "String", "BASE_URL", "\"http://apibeta.qxjiaoyou.com/\"" buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL" buildConfigField "String", "BASE_URL_STAGING", "\"https://preview.qxjiaoyou.com/\"" - buildConfigField "String", "BASE_URL_RELEASE", "\"https://api.qxjiaoyou.com/\"" + buildConfigField "String", "BASE_URL_RELEASE", "\"https://api.zhongjialx.com/\"" minifyEnabled false shrinkResources false 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 5a8f46882..899a3cb26 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 @@ -2,32 +2,24 @@ package com.yizhuan.erban.ui.login.fragment; import android.app.Activity; import android.os.Bundle; -import androidx.annotation.Nullable; -import com.google.android.material.textfield.TextInputEditText; import android.text.InputFilter; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.ImageView; import android.widget.RadioButton; -import com.fourmob.datetimepicker.date.DatePickerDialog; -import com.jph.takephoto.model.TResult; -import com.netease.nim.uikit.common.util.string.StringUtil; +import androidx.annotation.Nullable; + +import com.google.android.material.textfield.TextInputEditText; import com.sleepbot.datetimepicker.time.RadialPickerLayout; import com.sleepbot.datetimepicker.time.TimePickerDialog; import com.trello.rxlifecycle3.android.FragmentEvent; -import com.yizhuan.erban.ErbanTakePhotoActivity; import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseFragment; -import com.yizhuan.erban.common.widget.CircleImageView; import com.yizhuan.erban.ui.login.AddUserInfoActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.ButtonItem; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.auth.entity.ThirdUserInfo; -import com.yizhuan.xchat_android_core.file.FileModel; import com.yizhuan.xchat_android_core.linked.LinkedModel; import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; import com.yizhuan.xchat_android_core.statistic.StatisticManager; @@ -35,12 +27,9 @@ import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.UserModel; import com.yizhuan.xchat_android_core.user.bean.UserInfo; import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.utils.StringUtils; import java.io.File; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import io.reactivex.SingleObserver; @@ -101,11 +90,15 @@ public class AddUserInfoFragment extends BaseFragment private void addWXUserInfo() { ThirdUserInfo thirdUserInfo = AuthModel.get().getThirdUserInfo(); if (thirdUserInfo != null) { - String avatarUrlWX = thirdUserInfo.getUserIcon(); - String nick = thirdUserInfo.getUserName(); - String str_gender = thirdUserInfo.getUserGender()==null?"":thirdUserInfo.getUserGender(); - int gender = str_gender.equals("m")?UserInfo.GENDER_MALE:UserInfo.GENDER_FEMALE; - commit(nick,avatarUrlWX,gender); + if (thirdUserInfo.getType() == ThirdUserInfo.TYPE_WX || thirdUserInfo.getType() == ThirdUserInfo.TYPE_QQ){ + String avatarUrlWX = thirdUserInfo.getUserIcon(); + String nick = thirdUserInfo.getUserName(); + String str_gender = thirdUserInfo.getUserGender()==null?"":thirdUserInfo.getUserGender(); + int gender = str_gender.equals("m")?UserInfo.GENDER_MALE:UserInfo.GENDER_FEMALE; + commit(nick,avatarUrlWX,gender); + }else { + init(); + } }else { init(); } 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 151845dfa..b3bfd7184 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 @@ -393,6 +393,7 @@ public class AuthModel extends BaseModel implements IAuthModel { Logger.i("openid" + openid + "unionid" + unionid + platform.getDb().getUserIcon()); thirdUserInfo = new ThirdUserInfo(); thirdUserInfo.setPlatform("微信"); + thirdUserInfo.setType(ThirdUserInfo.TYPE_WX); thirdUserInfo.setUserName(platform.getDb().getUserName()); thirdUserInfo.setUserGender(platform.getDb().getUserGender()); thirdUserInfo.setUserIcon(platform.getDb().getUserIcon()); @@ -468,6 +469,7 @@ public class AuthModel extends BaseModel implements IAuthModel { Logger.i("openid:" + openid + " unionid:" + unionid + platform.getDb().getUserIcon()); thirdUserInfo = new ThirdUserInfo(); + thirdUserInfo.setType(ThirdUserInfo.TYPE_QQ); thirdUserInfo.setUserName(platform.getDb().getUserName()); thirdUserInfo.setUserGender(platform.getDb().getUserGender()); thirdUserInfo.setUserIcon(platform.getDb().getUserIcon()); 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 e516b5832..491e6e933 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 @@ -12,6 +12,19 @@ public class ThirdUserInfo implements Serializable { private String userGender; private String platform; 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 int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } public String getPlatform() { return platform;