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

动态

Browse Source
This commit is contained in:
oujunhui
2020-04-16 15:55:44 +08:00
parent 755a735d7d
commit eeff4fa0a2
237 changed files with 3686 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
View File

@@ -52,13 +52,13 @@ public class XChatConstants {
* 云信 key (DEBUG)
*/
// public static final String NIM_KEY_DEBUG = "2c375581f900a7b4ea3922fa7643f307";
public static final String NIM_KEY_DEBUG = "09bde8b3d86b98a6612bc3fc92709799";
public static final String NIM_KEY_DEBUG = "86bdf1285efb4419fe4a58b0046d2095";//6bdf1285efb4419fe4a58b0046d2095 09bde8b3d86b98a6612bc3fc92709799 86bdf1285efb4419fe4a58b0046d2095
/**
* 云信 key (RELEASE)
*/
// public static final String NIM_KEY_RELEASE = "ca46478c438dda51d25306f52fe7506b";
public static final String NIM_KEY_RELEASE = "09bde8b3d86b98a6612bc3fc92709799";
public static final String NIM_KEY_RELEASE = "86bdf1285efb4419fe4a58b0046d2095";
/**
* 网易易盾 productNumber
@@ -151,7 +151,7 @@ public class XChatConstants {
/**
* 分享房间标题
*/
public static final String SHARE_ROOM_TITLE = "上66陪玩，轻松寻觅对的TA";
public static final String SHARE_ROOM_TITLE = "上66星球，轻松寻觅对的TA";
/**
* 分享房间 URL
@@ -166,7 +166,7 @@ public class XChatConstants {
/**
* 分享家族标题
*/
public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的66陪玩家族:";
public static final String SHARE_FAMILY_TITLE = "hi,我想邀请您加入我的66星球家族:";
/**
* 分享家族 URL
@@ -181,7 +181,7 @@ public class XChatConstants {
/**
* 分享群组标题
*/
public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的66陪玩群聊:";
public static final String SHARE_TEAM_TITLE = "hi,我想邀请您加入我的66星球群聊:";
/**
* 分享群组 URL
@@ -258,7 +258,7 @@ public class XChatConstants {
public static final String REPORT_TYPE_PERSONAL_DYNAMIC = "PERSONAL_DYNAMIC"; // 个人页动态
public static final String REPORT_TYPE_DYNAMIC_SQUARE = "DYNAMIC_SQUARE";//广场动态
// 66陪玩
// 66星球
public static final String QUICK_PASS_BUSINESS_ID = BuildConfig.DEBUG ? "36b8c749cdfd43569fdd2aa10c098d60" : "398816ccd0094b3fa430dbad3c08c102";
// 侧耳
// public static final String QUICK_PASS_BUSINESS_ID = BuildConfig.DEBUG ? "cadbb4ed892549dab4d1adc9d62013bb" : "ba4a642810294561b9cd17034a448b49";

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

@@ -209,7 +209,7 @@ public class UriProvider {
}
/**
* 66陪玩专属，实名认证页面
* 66星球专属，实名认证页面
*
* @return
*/
@@ -218,7 +218,7 @@ public class UriProvider {
}
/**
* 66陪玩专属，101技能认证页面
* 66星球专属，101技能认证页面
*
* @return
*/

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/RoomTabInfo.java
View File

@@ -11,7 +11,7 @@ public class RoomTabInfo implements Serializable {
* uid : 2
* officeUser : 1
* roomId : 58892673
* title : 66陪玩张展伟的房间
* title : 66星球张展伟的房间
* type : 5
* meetingName : edc36c59bc9b449bb5bb58ac17b9c0b4
* valid : true

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/TabInfo.java
View File

@@ -93,7 +93,7 @@ public class TabInfo implements Parcelable,Serializable {
tabInfoList.add(new TabInfo(12, "交友"));
tabInfoList.add(new TabInfo(13, "娱乐"));
tabInfoList.add(new TabInfo(5, "电台"));
tabInfoList.add(new TabInfo(10, "陪玩"));
tabInfoList.add(new TabInfo(10, "星球"));
tabInfoList.add(new TabInfo(11, "音乐"));
return tabInfoList;
}

4
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/Test.java
View File

@@ -5,7 +5,7 @@ import java.util.List;
public class Test {
/**
* data : [{"uid":2,"officeUser":1,"roomId":58892673,"title":"66陪玩张展伟的房间","type":5,"meetingName":"edc36c59bc9b449bb5bb58ac17b9c0b4","valid":true,"operatorStatus":1,"avatar":"https://img.erbanyy.com/FikxU2u59uOjPVS1Sv_zfu4icqMS?imageslim","roomDesc":"","backPic":"","openTime":1545018501000,"onlineNum":1,"abChannelType":1,"roomPwd":"","roomTag":"聊天","calcSumDataIndex":0,"tagId":8,"tagPict":"https://img.erbanyy.com/new_tag_%E8%81%8A%E5%A4%A9@3x.png","badge":"","isPermitRoom":2,"isRecom":0,"count":0,"hasAnimationEffect":true,"audioQuality":1,"isCloseScreen":false,"hasDragonGame":true,"hasKTVPriv":true,"isOpenKTV":false,"isOpenGame":true,"roomModeType":0,"roomGame":{"roomId":58892673,"uid":2,"startUid":2,"gameId":"doushouqi1","gameName":"doushouqi1","status":5,"createTime":1548856711000,"updateTime":1548856711000},"isExceptionClose":false,"exceptionClose":false}]
* data : [{"uid":2,"officeUser":1,"roomId":58892673,"title":"66星球张展伟的房间","type":5,"meetingName":"edc36c59bc9b449bb5bb58ac17b9c0b4","valid":true,"operatorStatus":1,"avatar":"https://img.erbanyy.com/FikxU2u59uOjPVS1Sv_zfu4icqMS?imageslim","roomDesc":"","backPic":"","openTime":1545018501000,"onlineNum":1,"abChannelType":1,"roomPwd":"","roomTag":"聊天","calcSumDataIndex":0,"tagId":8,"tagPict":"https://img.erbanyy.com/new_tag_%E8%81%8A%E5%A4%A9@3x.png","badge":"","isPermitRoom":2,"isRecom":0,"count":0,"hasAnimationEffect":true,"audioQuality":1,"isCloseScreen":false,"hasDragonGame":true,"hasKTVPriv":true,"isOpenKTV":false,"isOpenGame":true,"roomModeType":0,"roomGame":{"roomId":58892673,"uid":2,"startUid":2,"gameId":"doushouqi1","gameName":"doushouqi1","status":5,"createTime":1548856711000,"updateTime":1548856711000},"isExceptionClose":false,"exceptionClose":false}]
* title : 墙裂推荐
* type : 1
* maxNum : 3
@@ -53,7 +53,7 @@ public class Test {
* uid : 2
* officeUser : 1
* roomId : 58892673
* title : 66陪玩张展伟的房间
* title : 66星球张展伟的房间
* type : 5
* meetingName : edc36c59bc9b449bb5bb58ac17b9c0b4
* valid : true

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.java
View File

@@ -754,7 +754,7 @@ public class HomeModel extends BaseModel implements IHomeModel {
/**
* 新版首页获取导航栏列表和下拉选择列表
*
* @param type 1-导航栏 2-首页下方的banner 3 66陪玩的banner
* @param type 1-导航栏 2-首页下方的banner 3 66星球的banner
* @return
*/
@GET("home/v5/getFirstPageBanner")

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/IHomeModel.java
View File

@@ -181,7 +181,7 @@ public interface IHomeModel extends IModel {
Single<ArrayList<BannerInfo>> getTabBanner(String tabId);
/**
* 66陪玩顶部 banner信息
* 66星球顶部 banner信息
* 包含3部分，顶部banner，测一测那个列表，标签页
*/
Single<HomeBannerInfo> getQxBannerInfo();

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

@@ -592,7 +592,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
}
/**
* 账号密码登录(耳伴老用户绑定 QQ 号登录66陪玩)
* 账号密码登录(耳伴老用户绑定 QQ 号登录66星球)
*
* @param account
* @param password
@@ -1475,7 +1475,7 @@ public class AuthModel extends BaseModel implements IAuthModel {
@Query("shuMeiDeviceId") String shuMeiDeviceId);
/**
* 66陪玩上耳伴老用户用 QQ 登录时，判断 QQ 的 open id 是否存在
* 66星球上耳伴老用户用 QQ 登录时，判断 QQ 的 open id 是否存在
*
* @return
*/

5
core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/HeadwearModel.java
View File

@@ -278,6 +278,11 @@ public class HeadwearModel extends BaseModel implements IHeadwearModel {
@Query("page") String page,
@Query("pageSize") String pageSize);
@GET("nameplate/userNameplateList")
Single<ServiceResult<List<HeadWearInfo>>> getNamePlateListV2(@Query("uid") String uid,
@Query("page") String page,
@Query("pageSize") String pageSize);
/**
* 获取头饰详情
* @param headwearId

4
core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/bean/NamePlateInfo.java Normal file
View File

@@ -0,0 +1,4 @@
package com.yizhuan.xchat_android_core.decoration.nameplate.bean;
public class NamePlateInfo {
}

4
core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomSettingModel.java
View File

@@ -257,7 +257,7 @@ public class RoomSettingModel extends BaseMvpModel {
/**
* 更新房间设置信息
* 66陪玩项目-打开关闭房间纯净模式-房主修改
* 66星球项目-打开关闭房间纯净模式-房主修改
*
* @param title
* @param desc
@@ -281,7 +281,7 @@ public class RoomSettingModel extends BaseMvpModel {
/**
* 更新房间设置信息
* 66陪玩项目-打开关闭房间纯净模式
* 66星球项目-打开关闭房间纯净模式
*
* @param title
* @param desc

2
core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamMember.java
View File

@@ -10,7 +10,7 @@ import lombok.Data;
@Data
public class PKTeamMember {
private String uid;//用户uid
private String erbanNo;//66陪玩号
private String erbanNo;//66星球号
private String nick;//昵称
private int gender;//性别
private String avatar;//头像

2
core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java
View File

@@ -182,7 +182,7 @@ public class StatisticsProtocol {
//模厅暗号
EVENT_HALL_ADDMEMBERS_USERID_CLICK("hall_addMembers_userid_click"),//添加成员-66陪玩ID
EVENT_HALL_ADDMEMBERS_USERID_CLICK("hall_addMembers_userid_click"),//添加成员-66星球ID
EVENT_HALL_ADDMEMBERS_WX_CLICK("hall_addMembers_wx_click"),//添加成员-微信导入
EVENT_HALL_ADDMEMBERS_QQ_CLICK("hall_addMembers_qq_click"),//添加成员-QQ导入
EVENT_HALL_PASSWORD_SHARE_WX("hall_password_share_wx"),//分享暗号到微信

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

@@ -914,7 +914,7 @@ public final class UserModel extends BaseModel implements IUserModel {
/**
*
* @param erbanNo 66陪玩号或手机号码
* @param erbanNo 66星球号或手机号码
* @return -
*/
@GET("user/getSimpleUser")

16
core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseUserInfo.java
View File

@@ -31,6 +31,22 @@ public class BaseUserInfo implements Serializable {
private int defUser;
private boolean newUser;
// 财富等级
private String experLevelPic;
// 魅力等级
private String charmLevelPic;
// 铭牌图片
private String nameplatePic;
// 铭牌文字
private String nameplateWord;
// 在哪个房间id
private Long inRoomId;
/**
* 贵族头饰
*/

2
core/src/main/java/com/yizhuan/xchat_android_core/user/bean/RecommendationUserInfo.java
View File

@@ -32,7 +32,7 @@ public class RecommendationUserInfo implements Serializable {
* recommendRoom : false
* liveTag : false
* status : 0
* description : 她在66陪玩魅力四射...
* description : 她在66星球魅力四射...
*/
private int uid;

22
core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicModel.java
View File

@@ -43,6 +43,13 @@ public class DynamicModel extends BaseModel implements IDynamicModel {
.compose(RxHelper.handleCommon());
}
@Override
public Single<WorldDynamicListResult> getLatestDynamicList(long worldId, String dynamicId) {
//此版本仅支持图文 固定传0,2
return api.apiGetLatestDynamicList(AuthModel.get().getCurrentUid(), worldId, dynamicId, 10, CommunityConstant.VERSION_VALID_TYPE)
.compose(RxHelper.handleCommon());
}
/**
* @param likedUid 被赞用户uid
* @param status 状态,0-取消赞,1-赞
@@ -86,7 +93,7 @@ public class DynamicModel extends BaseModel implements IDynamicModel {
private interface Api {
/**
*
*推荐
* @param dynamicId 动态id，本次从该id开始取(不包括当前id对应的记录)，不传从最新开始取
* @return -
*/
@@ -98,6 +105,19 @@ public class DynamicModel extends BaseModel implements IDynamicModel {
@Query("pageSize") int pageSize,
@Query("types") String types);
/**
*最新
* @param dynamicId 动态id，本次从该id开始取(不包括当前id对应的记录)，不传从最新开始取
* @return -
*/
@POST("dynamic/latestList")
Single<ServiceResult<WorldDynamicListResult>> apiGetLatestDynamicList(
@Query("uid") long uid,
@Query("worldId") long worldId,
@Query("dynamicId") String dynamicId,
@Query("pageSize") int pageSize,
@Query("types") String types);
/**
* @param likedUid 被赞用户uid
* @param status 状态,0-取消赞,1-赞

2
core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicModel.java
View File

@@ -12,6 +12,8 @@ public interface IDynamicModel {
Single<WorldDynamicListResult> getDynamicList(long worldId, String dynamicId);
Single<WorldDynamicListResult> getLatestDynamicList(long worldId, String dynamicId);
Single<String> like(long worldId, long dynamicId, long likedUid, int status, int event);
Single<String> delete(long worldId, long dynamicId);

4
core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/ISquareModel.java
View File

@@ -21,5 +21,9 @@ public interface ISquareModel {
* 关注动态列表
*/
Single<WorldDynamicListResult> getFollowerDynamics(String dynamicId, int pageSize);
/**
* 最新动态
*/
Single<WorldDynamicListResult> getLatestDynamics(int page, int pageSize,String dynamicId);
}

25
core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/SquareModel.java
View File

@@ -39,6 +39,16 @@ public class SquareModel extends BaseModel implements ISquareModel {
.compose(RxHelper.handleCommon(ArrayList::new));
}
/**
* 最新动态
*/
@Override
public Single<WorldDynamicListResult> getLatestDynamics(int page, int pageSize,String dynamicId) {
return api.apiLatestDynamics(page, pageSize,dynamicId, CommunityConstant.VERSION_VALID_TYPE)
.compose(RxHelper.handleCommon());
}
/**
* 关注动态列表
*/
@@ -48,6 +58,7 @@ public class SquareModel extends BaseModel implements ISquareModel {
.compose(RxHelper.handleCommon());
}
private interface Api {
/**
@@ -63,6 +74,20 @@ public class SquareModel extends BaseModel implements ISquareModel {
@Query("types") String types
);
/**
* 最新动态
* @param page 页数，1表示取首页，其他表示取其他页
* @param pageSize 请求返回的记录数
* @return -
*/
@GET("/dynamic/square/latestDynamics")
Single<ServiceResult<WorldDynamicListResult>> apiLatestDynamics(
@Query("page") int page,
@Query("pageSize") int pageSize,
@Query("dynamicId") String dynamicId,
@Query("types") String types
);
/**
* 关注的动态列表
* @param pageSize 请求返回的记录数

2
core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.java
View File

@@ -10,7 +10,7 @@ public class GrabApprenticesInfo {
private Long uid;
/**
* 66陪玩号
* 66星球号
*/
private Long erbanNo;

2
core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.java
View File

@@ -14,7 +14,7 @@ public class SimpleUserVo implements Serializable {
*/
private Long uid;
/**
* 66陪玩号
* 66星球号
*/
private Long erbanNo;
/**