moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_new' into develop_new

Browse Source
This commit is contained in:
huangjian
2020-05-13 11:10:06 +08:00
parent 8923c4b517 5c1dcc10e7
commit 77483c9471
7 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -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

4
app/src/main/java/com/yizhuan/erban/home/bean/CollectionRoomInfo.java
View File

@@ -5,7 +5,7 @@ import java.util.List;
public class CollectionRoomInfo {
/**
* totalPage : 1
* fansRoomList : [{"id":1,"roomId":170395761,"uid":934999,"roomAvatar":"https://img.erbanyy.com/qingxun_default_avatar.png","roomName":"辅导的房间","roomOnlineNum":1},{"id":2,"roomId":170408178,"uid":934999,"roomAvatar":"https://img.erbanyy.com/qingxun_default_avatar.png","roomName":"我是一只小萌新辅导辅导辅导辅导的房间","roomOnlineNum":1}]
* fansRoomList : [{"id":1,"roomId":170395761,"uid":934999,"roomAvatar":"https://image.zhongjialx.com/default_avatar.png","roomName":"辅导的房间","roomOnlineNum":1},{"id":2,"roomId":170408178,"uid":934999,"roomAvatar":"https://image.zhongjialx.com/default_avatar.png","roomName":"我是一只小萌新辅导辅导辅导辅导的房间","roomOnlineNum":1}]
*/
private int totalPage;
@@ -32,7 +32,7 @@ public class CollectionRoomInfo {
* id : 1
* roomId : 170395761
* uid : 934999
* roomAvatar : https://img.erbanyy.com/qingxun_default_avatar.png
* roomAvatar : https://image.zhongjialx.com/default_avatar.png
* roomName : 辅导的房间
* roomOnlineNum : 1
*/

4
app/src/main/java/com/yizhuan/erban/home/bean/HomePlayInfo.java
View File

@@ -7,7 +7,7 @@ public class HomePlayInfo {
/**
* uid : 935002
* roomId : 170395761
* micUsers : [{"uid":935002,"nick":"辅导","avatar":"https://img.erbanyy.com/qingxun_default_avatar.png","gender":2}]
* micUsers : [{"uid":935002,"nick":"辅导","avatar":"https://image.zhongjialx.com/default_avatar.png","gender":2}]
* micUserCount : 1
* onlineNum : 1
* isPermitRoom : 2
@@ -102,7 +102,7 @@ public class HomePlayInfo {
/**
* uid : 935002
* nick : 辅导
* avatar : https://img.erbanyy.com/qingxun_default_avatar.png
* avatar : https://image.zhongjialx.com/default_avatar.png
* gender : 2
*/

33
app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
View File

@@ -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();
}
@@ -132,7 +125,7 @@ public class AddUserInfoFragment extends BaseFragment
return;
}
String avatarUrl = "https://img.erbanyy.com/qingxun_default_avatar.png";
String avatarUrl = "https://image.zhongjialx.com/default_avatar.png";
commit(tvNick.getText().toString(),avatarUrl,gender);
break;

2
app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoOldFragment.java
View File

@@ -247,7 +247,7 @@ public class AddUserInfoOldFragment extends BaseFragment
avatarUrl = avatarUrlWX;
}
if (StringUtils.isEmpty(avatarUrl)) {
avatarUrl = "https://img.erbanyy.com/qingxun_default_avatar.png";
avatarUrl = "https://image.zhongjialx.com/default_avatar.png";
}
commit();
break;

2
core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java
View File

@@ -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());

13
core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/ThirdUserInfo.java
View File

@@ -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;