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

Merge branch 'develop_home' into develop_new

Browse Source
This commit is contained in:
oujunhui
2020-04-28 19:34:25 +08:00
parent e60230e35b b4469fe600
commit bfbaeb331f
40 changed files with 2258 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
View File

@@ -226,6 +226,15 @@ public class UriProvider {
return JAVA_WEB_URL.concat("/accompany/index.html#/MyIncome");
}
/**
* 用户充值协议
*
* @return
*/
public static String getRechargeAgreementUrl() {
return JAVA_WEB_URL.concat("/accompany/modules/rule/rechargeAgreement.html");
}
/**
* 66星球专属，101技能认证页面
*

24
core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WalletInfo.java
View File

@@ -13,9 +13,9 @@ import android.os.Parcelable;
public class WalletInfo implements Parcelable {
public long uid;
/** 总金币（贵族+普通）数量 */
public double goldNum;
public double golds;
/** 钻石数量 */
public double diamondNum;
public double diamonds;
/** 预扣款（押金） */
public double depositNum;
public int amount;
@@ -34,8 +34,8 @@ public class WalletInfo implements Parcelable {
protected WalletInfo(Parcel in) {
uid = in.readLong();
goldNum = in.readDouble();
diamondNum = in.readDouble();
golds = in.readDouble();
diamonds = in.readDouble();
depositNum = in.readDouble();
amount = in.readInt();
chargeGoldNum = in.readDouble();
@@ -45,8 +45,8 @@ public class WalletInfo implements Parcelable {
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeLong(uid);
dest.writeDouble(goldNum);
dest.writeDouble(diamondNum);
dest.writeDouble(golds);
dest.writeDouble(diamonds);
dest.writeDouble(depositNum);
dest.writeInt(amount);
dest.writeDouble(chargeGoldNum);
@@ -71,11 +71,11 @@ public class WalletInfo implements Parcelable {
};
public double getDiamondNum() {
return diamondNum;
return diamonds;
}
public void setDiamondNum(double diamondNum) {
this.diamondNum = diamondNum;
this.diamonds = diamondNum;
}
@@ -88,11 +88,11 @@ public class WalletInfo implements Parcelable {
}
public double getGoldNum() {
return goldNum;
return golds;
}
public void setGoldNum(double goldNum) {
this.goldNum = goldNum;
this.golds = goldNum;
}
public double getDepositNum() {
@@ -115,8 +115,8 @@ public class WalletInfo implements Parcelable {
public String toString() {
return "WalletInfo{" +
"uid=" + uid +
", goldNum=" + goldNum +
", diamondNum=" + diamondNum +
", goldNum=" + golds +
", diamondNum=" + diamonds +
", depositNum=" + depositNum +
", amount=" + amount +
'}';

12
core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java
View File

@@ -5,9 +5,11 @@ import androidx.annotation.Nullable;
import com.yizhuan.xchat_android_core.base.IModel;
import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
import com.yizhuan.xchat_android_core.user.bean.GiftAchievementInfo;
import com.yizhuan.xchat_android_core.user.bean.NewUserInfo;
import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo;
import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo;
import com.yizhuan.xchat_android_core.user.bean.UserGameInfo;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.user.bean.UserRandomConfig;
@@ -60,12 +62,20 @@ public interface IUserModel extends IModel {
/**
* 根据uid 从服务器获取用户详细信息。
*
*旧的
* @param userId
* @return
*/
Single<UserInfo> getUserInfoFromServer(long userId);
/**
* 根据uid 从服务器获取用户详细信息。
*66新的
* @param userId
* @return
*/
Single<UserDetailInfo> getUserInfoDetail(long userId);
/**
* 根据 批量 Uid 去我们后台获取用户的具体信息
*

18
core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java
View File

@@ -15,12 +15,14 @@ import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.bean.response.result.GiftWallListResult;
import com.yizhuan.xchat_android_core.bean.response.result.UserListResult;
import com.yizhuan.xchat_android_core.bean.response.result.UserResult;
import com.yizhuan.xchat_android_core.community.CommunityConstant;
import com.yizhuan.xchat_android_core.level.event.CharmLevelUpEvent;
import com.yizhuan.xchat_android_core.level.event.LevelUpEvent;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.user.bean.GiftAchievementInfo;
import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo;
import com.yizhuan.xchat_android_core.user.bean.NewUserInfo;
import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo;
import com.yizhuan.xchat_android_core.user.bean.UserGameInfo;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.user.bean.UserRandomConfig;
@@ -287,6 +289,18 @@ public final class UserModel extends BaseModel implements IUserModel {
}
@Override
public Single<UserDetailInfo> getUserInfoDetail(long uid) {
return api.getUserInfoDetail(String.valueOf(uid))
.compose(RxHelper.handleSchedulers())
.flatMap(userDetailInfo -> {
UserDetailInfo userInfo = userDetailInfo;
if (null == userInfo) {
return Single.error(new Exception("服务器返回的userInfo字段为空"));
}
return Single.just(userInfo);
});
}
/**
* 根据 云信的Uid 去我们后台获取用户的具体信息
@@ -622,6 +636,7 @@ public final class UserModel extends BaseModel implements IUserModel {
.compose(RxHelper.singleMainResult());
}
@Override
public Single<String> useOrDelete(long id, int status) {
return api.useOrDeleteTag(id, status)
@@ -762,6 +777,9 @@ public final class UserModel extends BaseModel implements IUserModel {
@GET("/user/get")
Single<UserResult> requestUserInfo(@Query("uid") String uid);
@GET("/user/detail/get")
Single<UserDetailInfo> getUserInfoDetail(@Query("uid") String uid);
/**
* @param key

416
core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserDetailInfo.java Normal file
View File

@@ -0,0 +1,416 @@
package com.yizhuan.xchat_android_core.user.bean;
import java.io.Serializable;
import java.util.List;
public class UserDetailInfo implements Serializable {
/**
* code : 200
* message : success
* data : {"uid":935001,"nick":"我是一只小萌新","erbanNo":3894073,"fansNum":1,"userLevelVo":{"experAmount":0,"charmAmount":0,"experUrl":"http://image.doudouyue.com/wealth_01.png","charmUrl":"http://image.doudouyue.com/charm_01.png","experLevelName":"Lv1","charmLevelName":"Lv1","experLevelGrp":"","charmLevelGrp":"","experLevelSeq":1,"charmLevelSeq":1},"userGiftWall":[],"dynamicInfo":[{"uid":935001,"worldId":-1,"content":"哈哈哈哈","likeCount":3,"commentCount":0,"dynamicId":1323,"publishTime":1587613571000,"playCount":0,"type":0,"status":1,"isLike":true,"nick":"我是一只小萌新","avatar":"https://img.erbanyy.com/qingxun_default_avatar.png"},{"uid":935001,"worldId":-1,"content":"测试哦","likeCount":0,"commentCount":0,"dynamicId":1290,"publishTime":1587113734000,"playCount":0,"type":0,"status":0,"isLike":false,"nick":"我是一只小萌新","avatar":"https://img.erbanyy.com/qingxun_default_avatar.png"},{"uid":935001,"worldId":-1,"content":"哈哈哈哈","likeCount":1,"commentCount":0,"dynamicId":1260,"publishTime":1587031053000,"playCount":0,"type":0,"status":1,"isLike":false,"nick":"我是一只小萌新","avatar":"https://img.erbanyy.com/qingxun_default_avatar.png"},{"uid":935001,"worldId":-1,"content":"哈哈","likeCount":0,"commentCount":0,"dynamicId":1246,"publishTime":1587019900000,"playCount":0,"type":0,"status":0,"isLike":false,"nick":"我是一只小萌新","avatar":"https://img.erbanyy.com/qingxun_default_avatar.png"},{"uid":935001,"worldId":-1,"content":"测试","likeCount":0,"commentCount":0,"dynamicId":1234,"publishTime":1586947335000,"playCount":0,"type":0,"status":0,"isLike":false,"nick":"我是一只小萌新","avatar":"https://img.erbanyy.com/qingxun_default_avatar.png"}],"privatePhoto":[{"photoUrl":"https://img.erbanyy.com/qingxun_default_avatar.png","seqNo":0},{"pid":1300,"photoUrl":"http://image.doudouyuyin.com/FpaSiFuVl7o0IDV5mWhwsuJoPOO_?imageslim","seqNo":1,"createTime":1587986501000},{"pid":1299,"photoUrl":"http://image.doudouyuyin.com/FlehFmWF3B-u4p5Pl96D-VkH8gYo?imageslim","seqNo":1,"createTime":1587986493000},{"pid":1298,"photoUrl":"http://image.doudouyuyin.com/FgS7jdfiky4712SuV4fb4Cxpe1tV?imageslim","seqNo":1,"createTime":1587986484000}]}
*/
private int code;
private String message;
private DataBean data;
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public DataBean getData() {
return data;
}
public void setData(DataBean data) {
this.data = data;
}
public static class DataBean {
/**
* uid : 935001
* nick : 我是一只小萌新
* erbanNo : 3894073
* fansNum : 1
* userLevelVo : {"experAmount":0,"charmAmount":0,"experUrl":"http://image.doudouyue.com/wealth_01.png","charmUrl":"http://image.doudouyue.com/charm_01.png","experLevelName":"Lv1","charmLevelName":"Lv1","experLevelGrp":"","charmLevelGrp":"","experLevelSeq":1,"charmLevelSeq":1}
* userGiftWall : []
* dynamicInfo : [{"uid":935001,"worldId":-1,"content":"哈哈哈哈","likeCount":3,"commentCount":0,"dynamicId":1323,"publishTime":1587613571000,"playCount":0,"type":0,"status":1,"isLike":true,"nick":"我是一只小萌新","avatar":"https://img.erbanyy.com/qingxun_default_avatar.png"},{"uid":935001,"worldId":-1,"content":"测试哦","likeCount":0,"commentCount":0,"dynamicId":1290,"publishTime":1587113734000,"playCount":0,"type":0,"status":0,"isLike":false,"nick":"我是一只小萌新","avatar":"https://img.erbanyy.com/qingxun_default_avatar.png"},{"uid":935001,"worldId":-1,"content":"哈哈哈哈","likeCount":1,"commentCount":0,"dynamicId":1260,"publishTime":1587031053000,"playCount":0,"type":0,"status":1,"isLike":false,"nick":"我是一只小萌新","avatar":"https://img.erbanyy.com/qingxun_default_avatar.png"},{"uid":935001,"worldId":-1,"content":"哈哈","likeCount":0,"commentCount":0,"dynamicId":1246,"publishTime":1587019900000,"playCount":0,"type":0,"status":0,"isLike":false,"nick":"我是一只小萌新","avatar":"https://img.erbanyy.com/qingxun_default_avatar.png"},{"uid":935001,"worldId":-1,"content":"测试","likeCount":0,"commentCount":0,"dynamicId":1234,"publishTime":1586947335000,"playCount":0,"type":0,"status":0,"isLike":false,"nick":"我是一只小萌新","avatar":"https://img.erbanyy.com/qingxun_default_avatar.png"}]
* privatePhoto : [{"photoUrl":"https://img.erbanyy.com/qingxun_default_avatar.png","seqNo":0},{"pid":1300,"photoUrl":"http://image.doudouyuyin.com/FpaSiFuVl7o0IDV5mWhwsuJoPOO_?imageslim","seqNo":1,"createTime":1587986501000},{"pid":1299,"photoUrl":"http://image.doudouyuyin.com/FlehFmWF3B-u4p5Pl96D-VkH8gYo?imageslim","seqNo":1,"createTime":1587986493000},{"pid":1298,"photoUrl":"http://image.doudouyuyin.com/FgS7jdfiky4712SuV4fb4Cxpe1tV?imageslim","seqNo":1,"createTime":1587986484000}]
*/
private int uid;
private String nick;
private int erbanNo;
private int fansNum;
private UserLevelVoBean userLevelVo;
private List<?> userGiftWall;
private List<DynamicInfoBean> dynamicInfo;
private List<PrivatePhotoBean> privatePhoto;
public int getUid() {
return uid;
}
public void setUid(int uid) {
this.uid = uid;
}
public String getNick() {
return nick;
}
public void setNick(String nick) {
this.nick = nick;
}
public int getErbanNo() {
return erbanNo;
}
public void setErbanNo(int erbanNo) {
this.erbanNo = erbanNo;
}
public int getFansNum() {
return fansNum;
}
public void setFansNum(int fansNum) {
this.fansNum = fansNum;
}
public UserLevelVoBean getUserLevelVo() {
return userLevelVo;
}
public void setUserLevelVo(UserLevelVoBean userLevelVo) {
this.userLevelVo = userLevelVo;
}
public List<?> getUserGiftWall() {
return userGiftWall;
}
public void setUserGiftWall(List<?> userGiftWall) {
this.userGiftWall = userGiftWall;
}
public List<DynamicInfoBean> getDynamicInfo() {
return dynamicInfo;
}
public void setDynamicInfo(List<DynamicInfoBean> dynamicInfo) {
this.dynamicInfo = dynamicInfo;
}
public List<PrivatePhotoBean> getPrivatePhoto() {
return privatePhoto;
}
public void setPrivatePhoto(List<PrivatePhotoBean> privatePhoto) {
this.privatePhoto = privatePhoto;
}
public static class UserLevelVoBean {
/**
* experAmount : 0
* charmAmount : 0
* experUrl : http://image.doudouyue.com/wealth_01.png
* charmUrl : http://image.doudouyue.com/charm_01.png
* experLevelName : Lv1
* charmLevelName : Lv1
* experLevelGrp :
* charmLevelGrp :
* experLevelSeq : 1
* charmLevelSeq : 1
*/
private int experAmount;
private int charmAmount;
private String experUrl;
private String charmUrl;
private String experLevelName;
private String charmLevelName;
private String experLevelGrp;
private String charmLevelGrp;
private int experLevelSeq;
private int charmLevelSeq;
public int getExperAmount() {
return experAmount;
}
public void setExperAmount(int experAmount) {
this.experAmount = experAmount;
}
public int getCharmAmount() {
return charmAmount;
}
public void setCharmAmount(int charmAmount) {
this.charmAmount = charmAmount;
}
public String getExperUrl() {
return experUrl;
}
public void setExperUrl(String experUrl) {
this.experUrl = experUrl;
}
public String getCharmUrl() {
return charmUrl;
}
public void setCharmUrl(String charmUrl) {
this.charmUrl = charmUrl;
}
public String getExperLevelName() {
return experLevelName;
}
public void setExperLevelName(String experLevelName) {
this.experLevelName = experLevelName;
}
public String getCharmLevelName() {
return charmLevelName;
}
public void setCharmLevelName(String charmLevelName) {
this.charmLevelName = charmLevelName;
}
public String getExperLevelGrp() {
return experLevelGrp;
}
public void setExperLevelGrp(String experLevelGrp) {
this.experLevelGrp = experLevelGrp;
}
public String getCharmLevelGrp() {
return charmLevelGrp;
}
public void setCharmLevelGrp(String charmLevelGrp) {
this.charmLevelGrp = charmLevelGrp;
}
public int getExperLevelSeq() {
return experLevelSeq;
}
public void setExperLevelSeq(int experLevelSeq) {
this.experLevelSeq = experLevelSeq;
}
public int getCharmLevelSeq() {
return charmLevelSeq;
}
public void setCharmLevelSeq(int charmLevelSeq) {
this.charmLevelSeq = charmLevelSeq;
}
}
public static class DynamicInfoBean {
/**
* uid : 935001
* worldId : -1
* content : 哈哈哈哈
* likeCount : 3
* commentCount : 0
* dynamicId : 1323
* publishTime : 1587613571000
* playCount : 0
* type : 0
* status : 1
* isLike : true
* nick : 我是一只小萌新
* avatar : https://img.erbanyy.com/qingxun_default_avatar.png
*/
private int uid;
private int worldId;
private String content;
private int likeCount;
private int commentCount;
private int dynamicId;
private long publishTime;
private int playCount;
private int type;
private int status;
private boolean isLike;
private String nick;
private String avatar;
public int getUid() {
return uid;
}
public void setUid(int uid) {
this.uid = uid;
}
public int getWorldId() {
return worldId;
}
public void setWorldId(int worldId) {
this.worldId = worldId;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public int getLikeCount() {
return likeCount;
}
public void setLikeCount(int likeCount) {
this.likeCount = likeCount;
}
public int getCommentCount() {
return commentCount;
}
public void setCommentCount(int commentCount) {
this.commentCount = commentCount;
}
public int getDynamicId() {
return dynamicId;
}
public void setDynamicId(int dynamicId) {
this.dynamicId = dynamicId;
}
public long getPublishTime() {
return publishTime;
}
public void setPublishTime(long publishTime) {
this.publishTime = publishTime;
}
public int getPlayCount() {
return playCount;
}
public void setPlayCount(int playCount) {
this.playCount = playCount;
}
public int getType() {
return type;
}
public void setType(int type) {
this.type = type;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public boolean isIsLike() {
return isLike;
}
public void setIsLike(boolean isLike) {
this.isLike = isLike;
}
public String getNick() {
return nick;
}
public void setNick(String nick) {
this.nick = nick;
}
public String getAvatar() {
return avatar;
}
public void setAvatar(String avatar) {
this.avatar = avatar;
}
}
public static class PrivatePhotoBean {
/**
* photoUrl : https://img.erbanyy.com/qingxun_default_avatar.png
* seqNo : 0
* pid : 1300
* createTime : 1587986501000
*/
private String photoUrl;
private int seqNo;
private int pid;
private long createTime;
public String getPhotoUrl() {
return photoUrl;
}
public void setPhotoUrl(String photoUrl) {
this.photoUrl = photoUrl;
}
public int getSeqNo() {
return seqNo;
}
public void setSeqNo(int seqNo) {
this.seqNo = seqNo;
}
public int getPid() {
return pid;
}
public void setPid(int pid) {
this.pid = pid;
}
public long getCreateTime() {
return createTime;
}
public void setCreateTime(long createTime) {
this.createTime = createTime;
}
}
}
}