YUSHENG/yusheng-android
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

合并1

Browse Source
This commit is contained in:
骆召亮
2025-11-12 16:40:26 +08:00
parent d4721faa42
commit 8013268816
332 changed files with 12369 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
BaseModule/src/main/java/com/xscm/moduleutil/bean/CircleListBean.java
View File

@@ -31,19 +31,23 @@ public class CircleListBean {
public String share_url;
public List<HeatedBean> title;//话题列表
public String nobility_image;//贵族图标
public String nickname_color;//昵称颜色
public String mic_cycle;//麦圈
public String read_num;//阅读数
public List<LikeList> like_list;
@Data
public class LikeList {
private String user_id;
private String nickname;
private String avatar;
private int age;//年龄
private String sex;
private String constellation;//星座
private String birthday;//生日
public String user_id;
public String nickname;
public String avatar;
public int age;//年龄
public String sex;
public String constellation;//星座
public String birthday;//生日
}
}

3
BaseModule/src/main/java/com/xscm/moduleutil/bean/ExpandColumnBean.java
View File

@@ -20,5 +20,6 @@ public class ExpandColumnBean {
private int room_id;//房间id,当有参数的时候，就显示跟随，当没有的时候，就显示私信控件
private String agree;
private List<String> icon;
private String nobility_image;//贵族图标
private String nickname_color;//昵称颜色
}

4
BaseModule/src/main/java/com/xscm/moduleutil/bean/MusicSongBean.java
View File

@@ -25,4 +25,8 @@ public class MusicSongBean implements Serializable {
private String dress;
private String charm;
private int is_hot;//是否是主持，并且是在9号麦位上
private String nobility_image;//贵族图标
private String nickname_color;//昵称颜色
private String mic_cycle;//麦圈
}

82
BaseModule/src/main/java/com/xscm/moduleutil/bean/NobilitDeatils.kt Normal file
View File

@@ -0,0 +1,82 @@
package com.xscm.moduleutil.bean
/**
*com.xscm.moduleutil.bean
*qx
*2025/11/8
*
*/
class NobilitDeatils {
var nobility_power_list = ArrayList<nobilityPowerItem>()
var user_info: UserInfo? = null
var nobility_info: NobilityInfo? = null
class UserInfo {
/*"user_info": { // 用户信息
"id": 20034, //用户Id
"nickname": "奋斗的石头", //用户昵称
"avatar": "http://test.vespa.qxyushen.top/data/avatar/head_pic.png" //用户头像
}*/
var id: Int = 0
var nickname: String = ""
var avatar: String = ""
}
class NobilityInfo {
/*"nobility_info": { // 爵位信息
"status": 0, //状态： 0去开通 1去续费
"lid": 0, //爵位ID
"name": "", // 爵位名称
"image": "", //爵位图片
"end_time": 0 //结束时间
}*/
var status: Int = 0
var name: String = ""
var lid: Int = 0
var image: String = ""
var end_time: String = ""
}
class nobilityPowerItem {
/*"lid": 0, //爵位ID
"name": "特权", //爵位名称
"power_ids": "", //权限ID
"nick_name_color": "无", //昵称颜色
"nick_name_color_name": "无", //昵称颜色名称
"nobility_list": [
{
"id": 1, //权限ID
"name": "专属徽章", //权限名称
"image": "", //权限图片
"status": 0 //权限状态 ： 0 不显示 1显示
},
{
"id": 2,
"name": "昵称颜色",
"image": "",
"status": 0
}
]*/
var lid: Int = 0
var name: String = ""
var power_ids: String = ""
var nick_name_color: String = ""
var nick_name_color_name: String = ""
var nobility_list = ArrayList<nobilityPowerItem>()
class nobilityPowerItem {
/*"id": 1, //权限ID
"name": "专属徽章", //权限名称
"image": "", //权限图片
"status": 0 //权限状态 ： 0 不显示 1显示*/
var id: Int = 0
var name: String = ""
var image: String = ""
var status: Int = 0
}
}
}

51
BaseModule/src/main/java/com/xscm/moduleutil/bean/NobilitList.kt Normal file
View File

@@ -0,0 +1,51 @@
package com.xscm.moduleutil.bean
/**
*com.xscm.moduleutil.bean
*qx
*2025/11/10
*
*/
class NobilitList {
var name: String = ""
var image: String = ""
var pay_price: String = ""
var power: Power? = Power()
var lid: Int = 0
var day : Int = 0
class Power {
var power_count: Int = 0
var this_power_count: Int = 0
var count_str: String = ""
var list = ArrayList<PowerItem>()
class PowerItem {
var id: Int = 0
var name: String = ""
var content: String = ""
var image: String = ""
}
}
/* {
"name": "骑士",
"image": "https://cos.xscmmidi.site/admin/ScreenShot_2025-11-05_175044_144_17623369241246.png",
"pay_price": "388.00",
"power": {
"power_count": 12,
"this_power_count": 1,
"count_str": "12/1",
"list": [
{
"id": 1,
"name": "专属徽章",
"content": "专属动态爵位徽章",
"image": ""
}
]
}
},
*/
}

49
BaseModule/src/main/java/com/xscm/moduleutil/bean/NobilityPrice.kt Normal file
View File

@@ -0,0 +1,49 @@
package com.xscm.moduleutil.bean
/**
*com.xscm.moduleutil.bean
*qx
*2025/11/10
*
*/
class NobilityPrice {
var lid : Int = 0
var nobility_name : String = ""
var nobility_image : String = ""
var price : String = ""
var pay_price : String = ""
var day : Int = 0
var end_time : String = ""
var power_list = ArrayList<PowerItem>()
class PowerItem {
var id : Int = 0
var content : String = ""
}
/* "lid": 2,
"nobility_name": "男爵",
"nobility_image": "https://cos.xscmmidi.site/admin/ScreenShot_2025-11-05_175121_076_17623369074684.png",
"price": "588.00", //实付价格
"pay_price": "588.00", //画线价格
"day": 30,
"power_list": [
{
"id": 1,
"content": "专属动态爵位徽章"
},
{
"id": 2,
"content": "设置昵称颜色字体"
},
{
"id": 3,
"content": "特殊入场动画音效"
},
{
"id": 4,
"content": "入场专属座驾动画"
}
],
"end_time": "2025-12-10 10:19:20"*/
}

1
BaseModule/src/main/java/com/xscm/moduleutil/bean/RoonGiftModel.java
View File

@@ -33,6 +33,7 @@ public class RoonGiftModel {
private int num;//礼物数量
private int activities_id;//4：盲盒 ；5：天空之境；
private int gift_bag;//10：天空之境 11：岁月之城 12：时空之巅
private int is_lock;//爵位礼物 0：不锁 1：锁
public boolean isCan_send_self() {
if ( isManghe()) {
return true;

12
BaseModule/src/main/java/com/xscm/moduleutil/bean/TableCellData.kt Normal file
View File

@@ -0,0 +1,12 @@
package com.xscm.moduleutil.bean
/**
*com.xscm.moduleutil.bean
*qx
*2025/11/8
*
*/
class TableCellData {
var title: String = ""
var color: String = ""
}

17
BaseModule/src/main/java/com/xscm/moduleutil/bean/UserInfo.java
View File

@@ -1,23 +1,19 @@
package com.xscm.moduleutil.bean;
import com.google.gson.annotations.SerializedName;
import com.xscm.moduleutil.BaseEvent;
import com.xscm.moduleutil.bean.room.FriendInfo;
import java.io.Serializable;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
*@author qx
*@data 2025/6/3
*@description: 个人信息，点击我的获取
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class UserInfo extends BaseEvent implements Serializable {
public class UserInfo implements Serializable {
private static final long serialVersionUID = 1L;
public static final String FEMALE = "2";
public static final String MALE = "1";
@@ -72,9 +68,18 @@ public class UserInfo extends BaseEvent implements Serializable {
private String red_num;
private String ta;
private String nobility_image;//贵族图标
private String nickname_color;//昵称颜色
private String mic_cycle;//麦圈
private String is_hide;//0不能设置，1：可以设置
private String hide_status;//0-取消隐身，1-设置隐身
private String enter_image;//爵位飘屏的背景
private String enter_text;//爵位飘屏的文字
// @Data
// @Data
// public static class TagList{
// private String id;
// private String tag_name;

2
BaseModule/src/main/java/com/xscm/moduleutil/bean/room/EmotionDeatils.kt
View File

@@ -6,6 +6,7 @@ data class EmotionDeatils(
var type_id: Int? = 0,
var name: String? = "",
var image: String? = "",
var is_lock: Int = 0,//0:未锁定 1:锁定
var animate_image : String? = "",
var children: List<Children>? =ArrayList (),
)
@@ -17,4 +18,5 @@ data class Children(
var name: String? = "",
var image: String? = "",
var animate_image : String? = "",
var is_lock: Int? = 0,//0:未锁定 1:锁定
)

3
BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomAuction.java
View File

@@ -37,6 +37,9 @@ public class RoomAuction implements Serializable {
private String base_image;//礼物图片
private long duration;//时间
private String charm;
private String nobility_image;//贵族图标
private String nickname_color;//昵称颜色
private String mic_cycle;//麦圈
}
@Data

2
BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomInfoResp.java
View File

@@ -5,6 +5,7 @@ import com.xscm.moduleutil.bean.MusicSongBean;
import java.io.Serializable;
import java.util.List;
import com.xscm.moduleutil.bean.NobilitDeatils;
import lombok.Data;
/**
@@ -31,6 +32,7 @@ public class RoomInfoResp implements Serializable {
private FriendInfo friend_info;
private GiftXlh gift_cycle;
private int hour_ranking_open;//1:开启 0：关闭
private NobilitDeatils.NobilityInfo nobility_info;
//弹出麦位操作弹出

8
BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomPitBean.java
View File

@@ -29,7 +29,7 @@ public class RoomPitBean implements Serializable {
*/
private String id;//id
private String pit_number = "-1";//麦位号
private String pit_number;//麦位号
private String state;//麦位状态 正常 ，1封麦；3禁麦
private int is_lock;//0未锁麦 1锁麦
private int is_mute;//0未禁麦 1禁麦
@@ -51,7 +51,7 @@ public class RoomPitBean implements Serializable {
private String emchat_username;
private String rank_id;
private String nobility;
// private String xin_dong;
// private String xin_dong;
private String banned;
private String dress_picture;
private RankInfo rank_info;
@@ -65,4 +65,8 @@ public class RoomPitBean implements Serializable {
private int heartId; // "heartId": 4,
private int heartNum; // "heartNum": 10510
private String nobility_image;//贵族图标
private String nickname_color;//昵称颜色
private String mic_cycle;//麦圈
}

4
BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomUserBean.java
View File

@@ -39,6 +39,10 @@ public class RoomUserBean implements Serializable {
private String is_mute;//是否在本房间禁言 1是 0否
private String is_mute_pit;//是否在本房间内禁麦 1是 0否
private String nobility_image;//贵族图标
private String nickname_color;//昵称颜色
private String mic_cycle;//麦圈
// private int banned;
// private int favorite;
// private int pit;