diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java index 36e0d529..c76a75d2 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/room/RoomSettingBean.java @@ -16,12 +16,14 @@ public class RoomSettingBean implements MultiItemEntity { public static final int QXRoomSettingTypeRoomTypeBoy = 12; /// 女神房 public static final int QXRoomSettingTypeRoomTypeGirl = 13; - ///交友 房 + /// 交友 房 public static final int QXRoomSettingTypeRoomTypeJiaoy = 27; //互娱 public static final int QXRoomSettingTypeRoomTypeHUYU = 28; //练歌房 public static final int QXRoomSettingTypeRoomTypeLianG = 31; + //签约 + public static final int QXRoomSettingTypeRoomTypeSIGNONTRACT = 32; /// 常用工具 /// 房间补贴 @@ -70,7 +72,7 @@ public class RoomSettingBean implements MultiItemEntity { private boolean select;//是否选中 - public RoomSettingBean(String name, String icon, String selectName, String selectIcon, int type, int read, boolean isSelected, boolean status,boolean select) { + public RoomSettingBean(String name, String icon, String selectName, String selectIcon, int type, int read, boolean isSelected, boolean status, boolean select) { this.name = name; this.icon = icon; this.selectName = selectName; @@ -86,6 +88,7 @@ public class RoomSettingBean implements MultiItemEntity { public int getItemType() { return itemType; } + public void updateItemType() { if (type == -1) { // 特殊值表示标题 this.itemType = ITEM_TYPE_DEFAULT; diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/bean/zhuangb/ZhuangBanShangChengBean.java b/BaseModule/src/main/java/com/xscm/moduleutil/bean/zhuangb/ZhuangBanShangChengBean.java index a79cfc9f..63f95b97 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/bean/zhuangb/ZhuangBanShangChengBean.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/bean/zhuangb/ZhuangBanShangChengBean.java @@ -15,11 +15,13 @@ public class ZhuangBanShangChengBean { private String is_perpetual; private String special_num ;//靓号 private String title ;//装扮名称 - private String type ;//类型，顶部的头部选择 + private String type="" ;//类型，顶部的头部选择 private String remaining_day ;//价格 private String base_image ;//显示图片 private String play_image;//播放图像 private boolean is_select = false; + private int num ;//数量 + private String ext_value="" ;//这是使用降身卡的时候，返回的参数，对应的是降身卡的前面，类似10% public boolean isIs_select() { return is_select; diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/enumType/RoomType.kt b/BaseModule/src/main/java/com/xscm/moduleutil/enumType/RoomType.kt index a7963926..a455f041 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/enumType/RoomType.kt +++ b/BaseModule/src/main/java/com/xscm/moduleutil/enumType/RoomType.kt @@ -15,8 +15,8 @@ enum class RoomType( DATING("交友", 1,3, 4, 8), // 1、3、4、8 均对应交友 BLACK_ROOM("小黑屋", 6), JUKEBOX("点唱", 9), - MUTUAL_ENTERTAINMENT("互娱", 17), - SIGN_CONTRACT("签约", 7); + MUTUAL_ENTERTAINMENT("互娱", 7), + SIGN_CONTRACT("签约", 10); companion object { diff --git a/BaseModule/src/main/res/drawable/bg_r12_c5ffc9_f9e9ff_c7ecfa.xml b/BaseModule/src/main/res/drawable/bg_r12_c5ffc9_f9e9ff_c7ecfa.xml new file mode 100644 index 00000000..0c6b6fb4 --- /dev/null +++ b/BaseModule/src/main/res/drawable/bg_r12_c5ffc9_f9e9ff_c7ecfa.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/BaseModule/src/main/res/drawable/bg_r12_fffac5_f9e9ff_c7d3fa.xml b/BaseModule/src/main/res/drawable/bg_r12_fffac5_f9e9ff_c7d3fa.xml new file mode 100644 index 00000000..c867c188 --- /dev/null +++ b/BaseModule/src/main/res/drawable/bg_r12_fffac5_f9e9ff_c7d3fa.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/BaseModule/src/main/res/drawable/bg_r4_f3ff98_d9ffe1_ffdaed.xml b/BaseModule/src/main/res/drawable/bg_r4_f3ff98_d9ffe1_ffdaed.xml new file mode 100644 index 00000000..af5adb0e --- /dev/null +++ b/BaseModule/src/main/res/drawable/bg_r4_f3ff98_d9ffe1_ffdaed.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/BaseModule/src/main/res/drawable/bg_r6_ff6f0_f6d2f2_c2ebff.xml b/BaseModule/src/main/res/drawable/bg_r6_ff6f0_f6d2f2_c2ebff.xml new file mode 100644 index 00000000..83db441b --- /dev/null +++ b/BaseModule/src/main/res/drawable/bg_r6_ff6f0_f6d2f2_c2ebff.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/BaseModule/src/main/res/drawable/bg_r8_top_aeedff.xml b/BaseModule/src/main/res/drawable/bg_r8_top_aeedff.xml new file mode 100644 index 00000000..da76109b --- /dev/null +++ b/BaseModule/src/main/res/drawable/bg_r8_top_aeedff.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/BaseModule/src/main/res/drawable/tv_border_background.xml b/BaseModule/src/main/res/drawable/tv_border_background.xml new file mode 100644 index 00000000..4d78ca7d --- /dev/null +++ b/BaseModule/src/main/res/drawable/tv_border_background.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_apply_for_mai.png b/BaseModule/src/main/res/mipmap-hdpi/icon_apply_for_mai.png deleted file mode 100644 index 4ba5a1fd..00000000 Binary files a/BaseModule/src/main/res/mipmap-hdpi/icon_apply_for_mai.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_apply_for_mai.webp b/BaseModule/src/main/res/mipmap-hdpi/icon_apply_for_mai.webp new file mode 100644 index 00000000..9cdbbf11 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_apply_for_mai.webp differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_contract.png b/BaseModule/src/main/res/mipmap-hdpi/icon_contract.png deleted file mode 100644 index 6a6a991f..00000000 Binary files a/BaseModule/src/main/res/mipmap-hdpi/icon_contract.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_contract.webp b/BaseModule/src/main/res/mipmap-hdpi/icon_contract.webp new file mode 100644 index 00000000..621882c7 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_contract.webp differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_cp_anim_bg.png b/BaseModule/src/main/res/mipmap-hdpi/icon_cp_anim_bg.png deleted file mode 100644 index 28555a7c..00000000 Binary files a/BaseModule/src/main/res/mipmap-hdpi/icon_cp_anim_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_cp_anim_bg.webp b/BaseModule/src/main/res/mipmap-hdpi/icon_cp_anim_bg.webp new file mode 100644 index 00000000..95046e26 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_cp_anim_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_gold_bg.png b/BaseModule/src/main/res/mipmap-hdpi/icon_gold_bg.png deleted file mode 100644 index 6e1ccc2c..00000000 Binary files a/BaseModule/src/main/res/mipmap-hdpi/icon_gold_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_gold_bg.webp b/BaseModule/src/main/res/mipmap-hdpi/icon_gold_bg.webp new file mode 100644 index 00000000..2fbc8d43 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_gold_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_heart_left_bg.png b/BaseModule/src/main/res/mipmap-hdpi/icon_heart_left_bg.png deleted file mode 100644 index 01214009..00000000 Binary files a/BaseModule/src/main/res/mipmap-hdpi/icon_heart_left_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_heart_left_bg.webp b/BaseModule/src/main/res/mipmap-hdpi/icon_heart_left_bg.webp new file mode 100644 index 00000000..d6363329 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_heart_left_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_host_top_tips_bg.png b/BaseModule/src/main/res/mipmap-hdpi/icon_host_top_tips_bg.png deleted file mode 100644 index 68913b39..00000000 Binary files a/BaseModule/src/main/res/mipmap-hdpi/icon_host_top_tips_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_host_top_tips_bg.webp b/BaseModule/src/main/res/mipmap-hdpi/icon_host_top_tips_bg.webp new file mode 100644 index 00000000..1d0102c8 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_host_top_tips_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_left_bg.png b/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_left_bg.png deleted file mode 100644 index 8f580bbf..00000000 Binary files a/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_left_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_left_bg.webp b/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_left_bg.webp new file mode 100644 index 00000000..67a1711e Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_left_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_right_bg.png b/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_right_bg.png deleted file mode 100644 index 12b99753..00000000 Binary files a/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_right_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_right_bg.webp b/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_right_bg.webp new file mode 100644 index 00000000..034c2a43 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_right_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_ship_bg.png b/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_ship_bg.png deleted file mode 100644 index 195d9d1b..00000000 Binary files a/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_ship_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_ship_bg.webp b/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_ship_bg.webp new file mode 100644 index 00000000..6eae333f Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_mentor_ship_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_show_alent.png b/BaseModule/src/main/res/mipmap-hdpi/icon_show_alent.png deleted file mode 100644 index af1c86f4..00000000 Binary files a/BaseModule/src/main/res/mipmap-hdpi/icon_show_alent.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_show_alent.webp b/BaseModule/src/main/res/mipmap-hdpi/icon_show_alent.webp new file mode 100644 index 00000000..f91ed51a Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_show_alent.webp differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_sign_contract.png b/BaseModule/src/main/res/mipmap-hdpi/icon_sign_contract.png deleted file mode 100644 index b20c9616..00000000 Binary files a/BaseModule/src/main/res/mipmap-hdpi/icon_sign_contract.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_sign_contract.webp b/BaseModule/src/main/res/mipmap-hdpi/icon_sign_contract.webp new file mode 100644 index 00000000..0de5264c Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_sign_contract.webp differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_time.png b/BaseModule/src/main/res/mipmap-hdpi/icon_time.png deleted file mode 100644 index 2a472b87..00000000 Binary files a/BaseModule/src/main/res/mipmap-hdpi/icon_time.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/icon_time.webp b/BaseModule/src/main/res/mipmap-hdpi/icon_time.webp new file mode 100644 index 00000000..735defc1 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/icon_time.webp differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/members_offline.webp b/BaseModule/src/main/res/mipmap-hdpi/members_offline.webp new file mode 100644 index 00000000..ef176595 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/members_offline.webp differ diff --git a/BaseModule/src/main/res/mipmap-hdpi/members_online.webp b/BaseModule/src/main/res/mipmap-hdpi/members_online.webp new file mode 100644 index 00000000..fd892810 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-hdpi/members_online.webp differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_apply_for_mai.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_apply_for_mai.png deleted file mode 100644 index e7c2c115..00000000 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/icon_apply_for_mai.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_apply_for_mai.webp b/BaseModule/src/main/res/mipmap-xhdpi/icon_apply_for_mai.webp new file mode 100644 index 00000000..f4c79757 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_apply_for_mai.webp differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_contract.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_contract.png deleted file mode 100644 index f643a933..00000000 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/icon_contract.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_contract.webp b/BaseModule/src/main/res/mipmap-xhdpi/icon_contract.webp new file mode 100644 index 00000000..c8d71051 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_contract.webp differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_cp_anim_bg.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_cp_anim_bg.png deleted file mode 100644 index b4c6d48c..00000000 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/icon_cp_anim_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_cp_anim_bg.webp b/BaseModule/src/main/res/mipmap-xhdpi/icon_cp_anim_bg.webp new file mode 100644 index 00000000..c0a196fd Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_cp_anim_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_gold_bg.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_gold_bg.png deleted file mode 100644 index 36514663..00000000 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/icon_gold_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_gold_bg.webp b/BaseModule/src/main/res/mipmap-xhdpi/icon_gold_bg.webp new file mode 100644 index 00000000..bc75a68e Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_gold_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_heart_left_bg.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_heart_left_bg.png deleted file mode 100644 index 77e78e5d..00000000 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/icon_heart_left_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_heart_left_bg.webp b/BaseModule/src/main/res/mipmap-xhdpi/icon_heart_left_bg.webp new file mode 100644 index 00000000..863a2d07 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_heart_left_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_host_top_tips_bg.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_host_top_tips_bg.png deleted file mode 100644 index 4e12fa9f..00000000 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/icon_host_top_tips_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_host_top_tips_bg.webp b/BaseModule/src/main/res/mipmap-xhdpi/icon_host_top_tips_bg.webp new file mode 100644 index 00000000..09d023da Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_host_top_tips_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_left_bg.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_left_bg.png deleted file mode 100644 index ae5104bc..00000000 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_left_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_left_bg.webp b/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_left_bg.webp new file mode 100644 index 00000000..e669930a Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_left_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_right_bg.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_right_bg.png deleted file mode 100644 index f8462ade..00000000 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_right_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_right_bg.webp b/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_right_bg.webp new file mode 100644 index 00000000..caa11ce7 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_right_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_ship_bg.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_ship_bg.png deleted file mode 100644 index 36e5a057..00000000 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_ship_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_ship_bg.webp b/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_ship_bg.webp new file mode 100644 index 00000000..382aad6e Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_mentor_ship_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_show_alent.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_show_alent.png deleted file mode 100644 index f8cfb9dd..00000000 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/icon_show_alent.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_show_alent.webp b/BaseModule/src/main/res/mipmap-xhdpi/icon_show_alent.webp new file mode 100644 index 00000000..c39c18d8 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_show_alent.webp differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_sign_contract.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_sign_contract.png deleted file mode 100644 index 8d067936..00000000 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/icon_sign_contract.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_sign_contract.webp b/BaseModule/src/main/res/mipmap-xhdpi/icon_sign_contract.webp new file mode 100644 index 00000000..cf8e7e82 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_sign_contract.webp differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_time.png b/BaseModule/src/main/res/mipmap-xhdpi/icon_time.png deleted file mode 100644 index 35552054..00000000 Binary files a/BaseModule/src/main/res/mipmap-xhdpi/icon_time.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/icon_time.webp b/BaseModule/src/main/res/mipmap-xhdpi/icon_time.webp new file mode 100644 index 00000000..53f25c26 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/icon_time.webp differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/members_offline.webp b/BaseModule/src/main/res/mipmap-xhdpi/members_offline.webp new file mode 100644 index 00000000..13962def Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/members_offline.webp differ diff --git a/BaseModule/src/main/res/mipmap-xhdpi/members_online.webp b/BaseModule/src/main/res/mipmap-xhdpi/members_online.webp new file mode 100644 index 00000000..e62403fb Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xhdpi/members_online.webp differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_apply_for_mai.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_apply_for_mai.png deleted file mode 100644 index 924d570f..00000000 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/icon_apply_for_mai.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_apply_for_mai.webp b/BaseModule/src/main/res/mipmap-xxhdpi/icon_apply_for_mai.webp new file mode 100644 index 00000000..c6b08811 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_apply_for_mai.webp differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_contract.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_contract.png deleted file mode 100644 index bd82890a..00000000 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/icon_contract.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_contract.webp b/BaseModule/src/main/res/mipmap-xxhdpi/icon_contract.webp new file mode 100644 index 00000000..28f5cd43 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_contract.webp differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_cp_anim_bg.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_cp_anim_bg.png deleted file mode 100644 index 40d23e2f..00000000 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/icon_cp_anim_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_cp_anim_bg.webp b/BaseModule/src/main/res/mipmap-xxhdpi/icon_cp_anim_bg.webp new file mode 100644 index 00000000..ca1ce783 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_cp_anim_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_gold_bg.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_gold_bg.png deleted file mode 100644 index 25a17092..00000000 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/icon_gold_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_gold_bg.webp b/BaseModule/src/main/res/mipmap-xxhdpi/icon_gold_bg.webp new file mode 100644 index 00000000..b552a75b Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_gold_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_heart_left_bg.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_heart_left_bg.png deleted file mode 100644 index 2f4bec3c..00000000 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/icon_heart_left_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_heart_left_bg.webp b/BaseModule/src/main/res/mipmap-xxhdpi/icon_heart_left_bg.webp new file mode 100644 index 00000000..24c59734 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_heart_left_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_host_top_tips_bg.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_host_top_tips_bg.png deleted file mode 100644 index 828caf4a..00000000 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/icon_host_top_tips_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_host_top_tips_bg.webp b/BaseModule/src/main/res/mipmap-xxhdpi/icon_host_top_tips_bg.webp new file mode 100644 index 00000000..cee753f8 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_host_top_tips_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_left_bg.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_left_bg.png deleted file mode 100644 index 9a2a6fad..00000000 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_left_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_left_bg.webp b/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_left_bg.webp new file mode 100644 index 00000000..55b8d937 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_left_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_right_bg.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_right_bg.png deleted file mode 100644 index 4d75f095..00000000 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_right_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_right_bg.webp b/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_right_bg.webp new file mode 100644 index 00000000..b7555ac6 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_right_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_ship_bg.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_ship_bg.png deleted file mode 100644 index 35a0a4a0..00000000 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_ship_bg.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_ship_bg.webp b/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_ship_bg.webp new file mode 100644 index 00000000..591b7cc6 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_mentor_ship_bg.webp differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_show_alent.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_show_alent.png deleted file mode 100644 index 690734a7..00000000 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/icon_show_alent.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_show_alent.webp b/BaseModule/src/main/res/mipmap-xxhdpi/icon_show_alent.webp new file mode 100644 index 00000000..d801eaf1 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_show_alent.webp differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_sign_contract.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_sign_contract.png deleted file mode 100644 index c8fd4f92..00000000 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/icon_sign_contract.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_sign_contract.webp b/BaseModule/src/main/res/mipmap-xxhdpi/icon_sign_contract.webp new file mode 100644 index 00000000..888bf116 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_sign_contract.webp differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_time.png b/BaseModule/src/main/res/mipmap-xxhdpi/icon_time.png deleted file mode 100644 index cdfbefb7..00000000 Binary files a/BaseModule/src/main/res/mipmap-xxhdpi/icon_time.png and /dev/null differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/icon_time.webp b/BaseModule/src/main/res/mipmap-xxhdpi/icon_time.webp new file mode 100644 index 00000000..369baaf1 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/icon_time.webp differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/members_offline.webp b/BaseModule/src/main/res/mipmap-xxhdpi/members_offline.webp new file mode 100644 index 00000000..04bdfce2 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/members_offline.webp differ diff --git a/BaseModule/src/main/res/mipmap-xxhdpi/members_online.webp b/BaseModule/src/main/res/mipmap-xxhdpi/members_online.webp new file mode 100644 index 00000000..cc4d5194 Binary files /dev/null and b/BaseModule/src/main/res/mipmap-xxhdpi/members_online.webp differ diff --git a/BaseModule/src/main/res/values/strings.xml b/BaseModule/src/main/res/values/strings.xml index e550098f..09ec6df5 100644 --- a/BaseModule/src/main/res/values/strings.xml +++ b/BaseModule/src/main/res/values/strings.xml @@ -4,6 +4,7 @@ 羽声语音 语圈 钱包 + 身价 等级 公会中心 个性装扮 @@ -12,6 +13,7 @@ 每日任务 消息 设置 + 我的家族 未点亮 已点亮 diff --git a/MainModule/src/main/AndroidManifest.xml b/MainModule/src/main/AndroidManifest.xml index 4b4ee369..a67567df 100644 --- a/MainModule/src/main/AndroidManifest.xml +++ b/MainModule/src/main/AndroidManifest.xml @@ -6,6 +6,12 @@ + + diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SongRequestFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SongRequestFragment.java index 5a06839f..bba671c2 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SongRequestFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/room/fragment/SongRequestFragment.java @@ -1,5 +1,6 @@ package com.xscm.modulemain.activity.room.fragment; +import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -9,6 +10,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; +import com.blankj.utilcode.util.ActivityUtils; import com.scwang.smartrefresh.layout.api.RefreshLayout; import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener; import com.xscm.modulemain.R; @@ -17,15 +19,23 @@ import com.xscm.modulemain.activity.room.contacts.RequestSongContacts; import com.xscm.modulemain.activity.room.presenter.RequestSongPresenter; import com.xscm.modulemain.activity.room.adapter.SongAdapter; import com.xscm.modulemain.activity.room.adapter.WheatPositionAdapter; +import com.xscm.modulemain.activity.user.activity.HeartCpActivity; import com.xscm.modulemain.databinding.FragmentSongRequestBinding; import com.xscm.moduleutil.base.BaseMvpFragment; +import com.xscm.moduleutil.bean.RoomGiftData; import com.xscm.moduleutil.bean.SingerSongCount; import com.xscm.moduleutil.bean.SongPlaylist; import com.xscm.moduleutil.bean.room.RoomPitBean; +import com.xscm.moduleutil.dialog.ConfirmDialog; +import com.xscm.moduleutil.http.BaseObserver; +import com.xscm.moduleutil.http.RetrofitClient; +import com.xscm.moduleutil.utils.SpUtil; import java.util.ArrayList; import java.util.List; +import io.reactivex.disposables.Disposable; + /** * 点歌页面Fragment */ @@ -128,16 +138,37 @@ public class SongRequestFragment extends BaseMvpFragment\n 演唱者："+song.getSinger_nickname()+"\n 礼物价值："+Integer.valueOf(song.getGift_price())*Integer.valueOf(song.getGift_num())+"金币", + "确认", + "取消", + v -> { + MvpPre.singerSong(song.getId() + "", roomId); + }, + v -> { + // 点击“取消”按钮时什么都不做 + + }, false,0).show(); + } + private void updateSongList(int wheatPosition) { // 根据选中的麦位更新歌曲列表 // 可以在这里调用接口获取对应麦位的歌曲列表 - MvpPre.getSong(wheatPosition + "", "", "1", "10"); + if (wheatPosition==0){ + MvpPre.getSong( "", roomId, "1", "10"); + }else { + MvpPre.getSong(wheatPosition + "", "", "1", "10"); + } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PersonalityActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PersonalityActivity.java index d0b0550e..1887d50a 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PersonalityActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/PersonalityActivity.java @@ -31,76 +31,9 @@ import java.util.List; * @description: 个性装扮 */ public class PersonalityActivity extends BaseMvpActivity implements PersonalityConacts.View { - private List titleList = new ArrayList(); - private List mFragments = new ArrayList(); - - private MyPagerAdapter myAdapter; @Override protected void initData() { - - - -// titleList.add("头像框"); -// titleList.add("座驾"); -// titleList.add("气泡"); -// titleList.add("个人靓号"); -// titleList.add("房间靓号"); -// titleList.add("工会靓号"); -// -// mFragments.add(ZhuangBanShangChengFragment.newInstance(1)); -// mFragments.add(ZhuangBanShangChengFragment.newInstance(2)); -// mFragments.add(ZhuangBanShangChengFragment.newInstance(3)); -// mFragments.add(ZhuangBanShangChengFragment.newInstance(4)); -// mFragments.add(ZhuangBanShangChengFragment.newInstance(5)); -// mFragments.add(ZhuangBanShangChengFragment.newInstance(6)); - -// myAdapter = new MyPagerAdapter(getSupportFragmentManager(), mFragments, titleList); -// mBinding.viewPager.setAdapter(myAdapter); -// mBinding.viewPager.setOffscreenPageLimit(mFragments.size()); -// mBinding.tabLayout.setupWithViewPager(mBinding.viewPager); -// setCustomViews(); - -// mBinding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { -// @Override -// public void onTabSelected(TabLayout.Tab tab) { -// updateTabView(tab, true); -// } -// -// @Override -// public void onTabUnselected(TabLayout.Tab tab) { -// updateTabView(tab, false); -// } -// -// @Override -// public void onTabReselected(TabLayout.Tab tab) { -// // 可选实现 -// } -// -// private void updateTabView(TabLayout.Tab tab, boolean isSelected) { -// if (tab.getCustomView() == null) return; -// -// TextView text = tab.getCustomView().findViewById(R.id.tv_zbtab); -// ImageView vView = tab.getCustomView().findViewById(R.id.v_view); -// -// if (text != null) { -// if (isSelected) { -// text.setTextColor(Color.parseColor("#333333")); -// text.setTextSize(16f); -// text.setTypeface(Typeface.DEFAULT_BOLD); -// } else { -// text.setTextColor(Color.parseColor("#5B5B5B")); -// text.setTextSize(14f); -// text.setTypeface(Typeface.DEFAULT); -// } -// } -// -// if (vView != null) { -// vView.setVisibility(isSelected ? View.VISIBLE : View.GONE); -// } -// } -// }); - } @Override @@ -135,44 +68,10 @@ public class PersonalityActivity extends BaseMvpActivity personaltyBean) { mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getSupportFragmentManager(), personaltyBean)); -// mBinding.viewPager.setOffscreenPageLimit(mFragments.size()); -// mBinding.tabLayout.setupWithViewPager(mBinding.viewPager); -// setCustomViews(); mBinding.slidingTabLayout.setViewPager(mBinding.viewPager); mBinding.slidingTabLayout.setCurrentTab(0); @@ -188,6 +87,11 @@ public class PersonalityActivity extends BaseMvpActivity(), + UserFamilyConacts.View { + + var page = 1 + var type = "1" + var revenueType = "1" + override fun bindPresenter(): UserFamilyPresenter? { + return UserFamilyPresenter(this, this) + } + + + override fun initData() { + mBinding.topBar.tvTitle.text = "总收益" + + mBinding.rl3.setOnClickListener({ v -> + val dialog = DoubleTimePickerBottomSheet() + dialog.setOnTimeRangeSelectedListener(OnTimeRangeSelectedListener { startDate: Date?, endDate: Date? -> + // 处理选择的时间范围 + val sdf = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) + Log.d("SelectedTime", "开始时间：" + sdf.format(startDate)) + mBinding.tv2.setText(sdf.format(startDate)) + Log.d("SelectedTime", "结束时间：" + sdf.format(endDate)) + mBinding.tv22.setText(sdf.format(endDate)) + page = 1 + + }) + val fragmentManager = supportFragmentManager + + dialog.show(fragmentManager,"DoubleTimePickerBottomSheet") + }) + } + + override fun getLayoutId(): Int { + return R.layout.activity_total_revenue + } +} \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/UserFamilyActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/UserFamilyActivity.kt new file mode 100644 index 00000000..2442880c --- /dev/null +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/UserFamilyActivity.kt @@ -0,0 +1,110 @@ +package com.xscm.modulemain.activity.user.activity + +import android.graphics.Color +import android.view.LayoutInflater +import android.widget.ImageView +import android.widget.TextView +import com.google.android.material.tabs.TabLayout +import com.google.android.material.tabs.TabLayoutMediator +import com.xscm.modulemain.BaseMvpActivity +import com.xscm.modulemain.R +import com.xscm.modulemain.activity.user.conacts.UserFamilyConacts +import com.xscm.modulemain.activity.user.presenter.UserFamilyPresenter +import com.xscm.modulemain.adapter.FamilyPagerAdapter +import com.xscm.modulemain.databinding.ActivityUserFamilyBinding + +/** +* @Author qx +* @Time 2025/11/25 17:11 +* @Description 我的家族 +*/ +class UserFamilyActivity : BaseMvpActivity(), + UserFamilyConacts.View { + + private lateinit var mAdapter: FamilyPagerAdapter + + override fun bindPresenter(): UserFamilyPresenter? { + return UserFamilyPresenter(this,this) + } + + override fun doDone() { + super.doDone() + } + + override fun initView() { + super.initView() + } + + override fun initData() { + mBinding.topBar.setTitle("家族") + mBinding.topBar.setColor(getResources().getColor(R.color.white)) + setupViewPager() + setupTabLayout() + } + + + + override fun getLayoutId(): Int { + return R.layout.activity_user_family + } + + private fun setupViewPager() { + mAdapter = FamilyPagerAdapter(this) + mBinding.viewPager.adapter = mAdapter + } + + private fun setupTabLayout() { + // 设置TabLayout的内部padding为0，确保tab与边框贴合 + + TabLayoutMediator(mBinding.tabLayout, mBinding.viewPager) { tab, position -> + // 创建自定义Tab视图 + val customView = LayoutInflater.from(this).inflate(R.layout.custom_tab_family, null) + val tabTitle = customView.findViewById(R.id.tab_title) + + when (position) { + 0 -> { + tabTitle.text = "我的家族" + } + 1 -> { + tabTitle.text = "我加入的家族" + } + } + + // 设置Tab的初始状态 + if (position == 0) { + tabTitle.setBackgroundResource(R.mipmap.user_tab_bj) + tabTitle.setTextColor(Color.BLACK) + } else { + tabTitle.setBackgroundResource(0) + tabTitle.setTextColor(Color.WHITE) + } + + tab.customView = customView + }.attach() + + // 设置Tab选中监听 + mBinding.tabLayout.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener { + override fun onTabSelected(tab: TabLayout.Tab) { + val customView = tab.customView + if (customView != null) { + val tabTitle = customView.findViewById(R.id.tab_title) + tabTitle.setTextColor(Color.BLACK) + tabTitle.setBackgroundResource(R.mipmap.user_tab_bj) + } + } + + override fun onTabUnselected(tab: TabLayout.Tab) { + val customView = tab.customView + if (customView != null) { + val tabTitle = customView.findViewById(R.id.tab_title) + tabTitle.setTextColor(Color.WHITE) + tabTitle.setBackgroundResource(0) + } + } + + override fun onTabReselected(tab: TabLayout.Tab) { + // 可以在这里处理重复点击Tab的事件 + } + }) + } +} \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ui/main/BosomFriendFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ui/main/BosomFriendFragment.kt index d0055e2b..bbb3cddb 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ui/main/BosomFriendFragment.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/ui/main/BosomFriendFragment.kt @@ -109,6 +109,9 @@ class BosomFriendFragment : BaseMvpFragment{ + + } + + interface IPre : IPresenter { + + } +} \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/JoinedFamilyFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/JoinedFamilyFragment.kt new file mode 100644 index 00000000..5d8f1690 --- /dev/null +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/JoinedFamilyFragment.kt @@ -0,0 +1,39 @@ +package com.xscm.modulemain.activity.user.fragment + +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.fragment.app.Fragment +import com.xscm.modulemain.databinding.FragmentJoinedFamilyBinding + +/** + * @Author qx + * @Time 2025/11/25 17:20 + * @Description 我加入的家族Fragment + */ +class JoinedFamilyFragment : Fragment() { + + private var _binding: FragmentJoinedFamilyBinding? = null + private val binding get() = _binding!! + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + _binding = FragmentJoinedFamilyBinding.inflate(inflater, container, false) + return binding.root + } + + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + + companion object { + fun newInstance(): JoinedFamilyFragment { + return JoinedFamilyFragment() + } + } +} diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/MyFamilyFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/MyFamilyFragment.kt new file mode 100644 index 00000000..b54d141c --- /dev/null +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/MyFamilyFragment.kt @@ -0,0 +1,86 @@ +package com.xscm.modulemain.activity.user.fragment + +import android.content.Intent +import android.view.View +import com.blankj.utilcode.util.ActivityUtils +import com.xscm.modulemain.R +import com.xscm.modulemain.activity.user.activity.HeartCpActivity +import com.xscm.modulemain.activity.user.activity.TotalRevenueActivity +import com.xscm.modulemain.activity.user.conacts.UserFamilyConacts +import com.xscm.modulemain.activity.user.presenter.UserFamilyPresenter +import com.xscm.modulemain.databinding.FragmentMyFamilyBinding +import com.xscm.moduleutil.base.BaseMvpFragment +import com.xscm.moduleutil.dialog.ConfirmDialog +import com.xscm.moduleutil.widget.CommonEmptyView + +/** + * @Author qx + * @Time 2025/11/25 17:20 + * @Description 我的家族Fragment + */ +class MyFamilyFragment : BaseMvpFragment(), UserFamilyConacts.View { + + override fun bindPresenter(): UserFamilyPresenter? { + return UserFamilyPresenter(this, activity!!) + } + + + override fun onDestroyView() { + super.onDestroyView() + } + + override fun initData() { + } + + override fun initView() { + mBinding.tvZsyNum2.setOnClickListener { + val intent= Intent(activity, TotalRevenueActivity::class.java) + startActivity(intent) + } + + val commonEmptyView = CommonEmptyView(getContext()!!) + commonEmptyView.setImg(R.mipmap.ic_empty) + commonEmptyView.setTextColor(getResources().getColor(com.xscm.moduleutil.R.color.color_FFBDBDBC)) +// manageAdapter.bindToRecyclerView(mBinding.recycleView) +// manageAdapter.setEmptyView(commonEmptyView) + } + + override fun getLayoutId(): Int { + return R.layout.fragment_my_family + } + + companion object { + fun newInstance(): MyFamilyFragment { + return MyFamilyFragment() + } + } + + private fun queren1( + type: Int, + content: String?, + giftid: String?, + userId: String, + roomId: String? + ) { + // 创建并显示确认对话框 + ConfirmDialog( + ActivityUtils.getTopActivity(), + "续约提示", + content, + if (type == 1) "确认免费续约" else "确认续约", + "取消", + View.OnClickListener { v: View? -> + if (type == 1) { + + } else { + val userids = userId.toInt() + val intent = Intent(ActivityUtils.getTopActivity(), HeartCpActivity::class.java) + intent.putExtra("userId", userids) + startActivity(intent) + } + }, + View.OnClickListener { v: View? -> }, false, 0 + ).show() + } + +} diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java index 84e661ac..98701056 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java @@ -26,6 +26,7 @@ import com.xscm.modulemain.activity.user.activity.GiftWallActivity; import com.xscm.modulemain.activity.user.activity.NobleTitleActivity; import com.xscm.modulemain.activity.user.activity.RechargeActivity; import com.xscm.modulemain.activity.user.activity.SingerVerificationActivity; +import com.xscm.modulemain.activity.user.activity.UserFamilyActivity; import com.xscm.modulemain.activity.user.activity.UserPlaylistActivity; import com.xscm.modulemain.databinding.FragmentVocalRangeBinding; import com.xscm.modulemain.activity.user.activity.BlacklistActivity; @@ -40,6 +41,7 @@ import com.xscm.modulemain.activity.user.activity.UserHomepageActivity; import com.xscm.modulemain.activity.user.conacts.MeConacts; import com.xscm.modulemain.activity.user.presenter.MePresenter; import com.xscm.modulemain.activity.WebViewActivity; +import com.xscm.modulemain.dialog.UserNetWorthDialog; import com.xscm.moduleutil.base.WebUrlConstants; import com.xscm.moduleutil.widget.ShineTextView; import com.xscm.moduleutil.base.BaseMvpFragment; @@ -124,6 +126,8 @@ public class VocalRangeFragment extends BaseMvpFragment implements ZhuangBanShangChengConactos.View { private int type; @@ -40,6 +53,7 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment(); -// for (int i = 0; i < 10; i++) { -// ZhuangBanShangChengBean zhuangBanShangChengBean=new ZhuangBanShangChengBean(); -// zhuangBanShangChengBean.setTitle("标题"+i); -// zhuangBanShangChengBean.setIntegral("积分"+i); -// zhuangBanShangChengBean.setPeriod(i); -// zhuangBanShangChengBean.setType("类型"+i); -// zhuangBanShangChengBean.setBase_image(""); -// zhuangBanShangChengBeanList.add(zhuangBanShangChengBean); -// } image_user = (RoundedImageView) getActivity().findViewById(R.id.iv_user); imageBg = (AvatarFrameView) getActivity().findViewById(R.id.image_headPortrait); // imageBg2 = (GiftAnimView) getActivity().findViewById(R.id.image_headPortrait2); @@ -105,21 +112,6 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment list = (List) adapter1.getData(); // 清除之前的选择状态 clearPreviousSelection(list); -// // 设置当前选择 -// ZhuangBanShangChengBean selectedBean = list.get(position); -// selectedBean.setIs_select(true); -// pSelect = position; -// did = selectedBean.getUdid(); -// -// // 更新UI显示 -// if (position == 0) { // "无"选项 -// mBinding.ll.setVisibility(View.GONE); -// clearDecorations(); -// } else { -// mBinding.ll.setVisibility(View.VISIBLE); -// -// if ("svga".equalsIgnoreCase(getFileExtension(selectedBean.getPlay_image()))) { -// imageBg.stopAll(); -// imageBg.setSource(selectedBean.getPlay_image(), 2); -// } else if ("mp4".equalsIgnoreCase(getFileExtension(selectedBean.getPlay_image()))) { -// imageBg.stopAll(); -// imageBg.setSource(selectedBean.getPlay_image(), 2); -// } -// } if (pSelect != -1 && pSelect != position) { list.get(pSelect).setIs_select(false); list.get(position).setIs_select(true); pSelect = position; did = list.get(position).getUdid(); - mBinding.ll.setVisibility(View.VISIBLE); - if (list.get( position)!=null && list.get(position).getType()!=null && list.get(position).getPlay_image()!=null) { -// if ("svga".equalsIgnoreCase(getFileExtension(list.get(position).getPlay_image()))) { + + mBinding.ll.setVisibility(View.VISIBLE); + if (list.get(position) != null && list.get(position).getType() != null && list.get(position).getPlay_image() != null) { + if (list.get(position).getType().equals("1")) { imageBg2.setVisibility(View.GONE); imageBg.stopAll(); imageBg.setSource(list.get(position).getPlay_image(), 2); } else if (list.get(position).getType().equals("2")) { -// imageBg2.setSource(list.get(position).getPlay_image(), 2); imageBg2.setVisibility(View.VISIBLE); imageBg2.previewEffectWith(list.get(position).getPlay_image()); } } -// } else if ("mp4".equalsIgnoreCase(getFileExtension(list.get(position).getPlay_image()))) { -//// imageBg.playMP4(Uri.parse(list.get(position).getPlay_image())); -// imageBg.stopAll(); -// imageBg.setSource(list.get(position).getPlay_image(),2); -// } } else if (pSelect != -1 && pSelect == position) { list.get(position).setIs_select(false); pSelect = -1; @@ -185,7 +151,7 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment { + MvpPre.setUserDecorate(did); + }, + v -> { + // 点击“取消”按钮时什么都不做 + + }, false, 0).show(); + } + + public String getFormattedText(String name, String price) { + // 1. 构建完整的字符串 + String fullText = "亲爱的羽声用户，您好~ \n 您是否确认使用" + name + "，本次使用后，您的实时身价将会降低" + price + "%身价。"; + + // 2. 创建 SpannableString 实例 + SpannableString spannableString = new SpannableString(fullText); + + // 3. 找到需要变色的文本的起始和结束位置 + int nameStart = fullText.indexOf(name); + int nameEnd = nameStart + name.length(); + + int priceStart = fullText.indexOf(price); + int priceEnd = priceStart + price.length(); + + // 4. 创建颜色 Span + ForegroundColorSpan colorSpan = new ForegroundColorSpan(Color.RED); // 使用 Color.RED 或者你自己的颜色资源 + + // 5. 将 Span 应用到指定范围 + if (nameStart != -1) { + spannableString.setSpan(colorSpan, nameStart, nameEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + } + if (priceStart != -1) { + spannableString.setSpan(colorSpan, priceStart, priceEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + } + + return spannableString.toString(); + } + @Override protected int getLayoutId() { return R.layout.zhuangban_recyclerview_noref; @@ -276,13 +273,15 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment(); + if (zhuangBanShangChengBeans == null) { + zhuangBanShangChengBeans = new ArrayList<>(); + } + if (type != 12) { + ZhuangBanShangChengBean zhuangBanShangChengBean = new ZhuangBanShangChengBean(); + zhuangBanShangChengBean.setTitle("无"); + zhuangBanShangChengBean.setBase_image(""); + zhuangBanShangChengBeans.add(0, zhuangBanShangChengBean); } - ZhuangBanShangChengBean zhuangBanShangChengBean = new ZhuangBanShangChengBean(); - zhuangBanShangChengBean.setTitle("无"); - zhuangBanShangChengBean.setBase_image(""); - zhuangBanShangChengBeans.add(0, zhuangBanShangChengBean); adapter.setNewData(zhuangBanShangChengBeans); this.tabIndex = tabIndex; @@ -291,6 +290,7 @@ public class ZhuangBanShangChengFragment extends BaseMvpFragment(view,context), UserFamilyConacts.IPre{ + +} \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/FamilyPagerAdapter.kt b/MainModule/src/main/java/com/xscm/modulemain/adapter/FamilyPagerAdapter.kt new file mode 100644 index 00000000..6c69fbeb --- /dev/null +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/FamilyPagerAdapter.kt @@ -0,0 +1,27 @@ +package com.xscm.modulemain.adapter + +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentActivity +import androidx.viewpager2.adapter.FragmentStateAdapter +import com.xscm.modulemain.activity.user.fragment.JoinedFamilyFragment +import com.xscm.modulemain.activity.user.fragment.MyFamilyFragment + +/** + * @Author qx + * @Time 2025/11/25 17:25 + * @Description 家族页面ViewPager2适配器 + */ +class FamilyPagerAdapter(activity: FragmentActivity) : FragmentStateAdapter(activity) { + + override fun getItemCount(): Int { + return 2 + } + + override fun createFragment(position: Int): Fragment { + return when (position) { + 0 -> MyFamilyFragment.newInstance() + 1 -> JoinedFamilyFragment.newInstance() + else -> MyFamilyFragment.newInstance() + } + } +} diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java index 54c002a1..01dc67ea 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java @@ -59,6 +59,8 @@ public class RoomSettingAdapter extends BaseMultiItemQuickAdapter { @@ -383,7 +402,7 @@ public class RoomSettingFragment extends BaseMvpDialogFragment + + + + \ No newline at end of file diff --git a/MainModule/src/main/res/drawable/tab_family_selector.xml b/MainModule/src/main/res/drawable/tab_family_selector.xml new file mode 100644 index 00000000..68b2459c --- /dev/null +++ b/MainModule/src/main/res/drawable/tab_family_selector.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/MainModule/src/main/res/drawable/tab_text_color_selector.xml b/MainModule/src/main/res/drawable/tab_text_color_selector.xml new file mode 100644 index 00000000..1ad2605a --- /dev/null +++ b/MainModule/src/main/res/drawable/tab_text_color_selector.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/MainModule/src/main/res/layout/activity_total_revenue.xml b/MainModule/src/main/res/layout/activity_total_revenue.xml new file mode 100644 index 00000000..587d01c4 --- /dev/null +++ b/MainModule/src/main/res/layout/activity_total_revenue.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MainModule/src/main/res/layout/activity_user_family.xml b/MainModule/src/main/res/layout/activity_user_family.xml new file mode 100644 index 00000000..ab056cc1 --- /dev/null +++ b/MainModule/src/main/res/layout/activity_user_family.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MainModule/src/main/res/layout/custom_tab_family.xml b/MainModule/src/main/res/layout/custom_tab_family.xml new file mode 100644 index 00000000..1bb54025 --- /dev/null +++ b/MainModule/src/main/res/layout/custom_tab_family.xml @@ -0,0 +1,29 @@ + + + + + + diff --git a/MainModule/src/main/res/layout/dialog_user_net_worth.xml b/MainModule/src/main/res/layout/dialog_user_net_worth.xml new file mode 100644 index 00000000..eda0ae2e --- /dev/null +++ b/MainModule/src/main/res/layout/dialog_user_net_worth.xml @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MainModule/src/main/res/layout/fragment_bosom_friend.xml b/MainModule/src/main/res/layout/fragment_bosom_friend.xml index 8e83237d..23916419 100644 --- a/MainModule/src/main/res/layout/fragment_bosom_friend.xml +++ b/MainModule/src/main/res/layout/fragment_bosom_friend.xml @@ -7,18 +7,19 @@ + android:layout_height="match_parent" + > + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintTop_toBottomOf="@+id/smart_refresh_layout"/> + + + + + + diff --git a/MainModule/src/main/res/layout/fragment_my_family.xml b/MainModule/src/main/res/layout/fragment_my_family.xml new file mode 100644 index 00000000..68e89c34 --- /dev/null +++ b/MainModule/src/main/res/layout/fragment_my_family.xml @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MainModule/src/main/res/layout/fragment_vocal_range.xml b/MainModule/src/main/res/layout/fragment_vocal_range.xml index 19635bfc..0fe36aef 100644 --- a/MainModule/src/main/res/layout/fragment_vocal_range.xml +++ b/MainModule/src/main/res/layout/fragment_vocal_range.xml @@ -614,12 +614,42 @@ android:textSize="@dimen/sp_12" /> + + + + + + + + + + + + + + + - - - - - @@ -997,17 +1029,34 @@ android:textSize="@dimen/sp_12" /> - + app:layout_flexGrow="1"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MainModule/src/main/res/layout/item_total_revenue.xml b/MainModule/src/main/res/layout/item_total_revenue.xml new file mode 100644 index 00000000..af6d3314 --- /dev/null +++ b/MainModule/src/main/res/layout/item_total_revenue.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MainModule/src/main/res/mipmap-hdpi/bg_family_members.webp b/MainModule/src/main/res/mipmap-hdpi/bg_family_members.webp new file mode 100644 index 00000000..0b0f4e86 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/bg_family_members.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/bg_net_worth.webp b/MainModule/src/main/res/mipmap-hdpi/bg_net_worth.webp new file mode 100644 index 00000000..aad9918b Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/bg_net_worth.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/ic_empty.webp b/MainModule/src/main/res/mipmap-hdpi/ic_empty.webp new file mode 100644 index 00000000..5b9bd7bb Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/ic_empty.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_cp_tops_bg.png b/MainModule/src/main/res/mipmap-hdpi/icon_cp_tops_bg.png deleted file mode 100644 index a0d37a62..00000000 Binary files a/MainModule/src/main/res/mipmap-hdpi/icon_cp_tops_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_cp_tops_bg.webp b/MainModule/src/main/res/mipmap-hdpi/icon_cp_tops_bg.webp new file mode 100644 index 00000000..89c9a3e0 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_cp_tops_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_heart_back.png b/MainModule/src/main/res/mipmap-hdpi/icon_heart_back.png deleted file mode 100644 index 8455b5be..00000000 Binary files a/MainModule/src/main/res/mipmap-hdpi/icon_heart_back.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_heart_back.webp b/MainModule/src/main/res/mipmap-hdpi/icon_heart_back.webp new file mode 100644 index 00000000..fcfe943b Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_heart_back.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_heart_cp_bg.png b/MainModule/src/main/res/mipmap-hdpi/icon_heart_cp_bg.png deleted file mode 100644 index 3d1cb87c..00000000 Binary files a/MainModule/src/main/res/mipmap-hdpi/icon_heart_cp_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_heart_cp_bg.webp b/MainModule/src/main/res/mipmap-hdpi/icon_heart_cp_bg.webp new file mode 100644 index 00000000..40637fab Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_heart_cp_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_heart_ex_bg.png b/MainModule/src/main/res/mipmap-hdpi/icon_heart_ex_bg.png deleted file mode 100644 index 6f2ec358..00000000 Binary files a/MainModule/src/main/res/mipmap-hdpi/icon_heart_ex_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_heart_ex_bg.webp b/MainModule/src/main/res/mipmap-hdpi/icon_heart_ex_bg.webp new file mode 100644 index 00000000..3225fcbe Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_heart_ex_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_heart_head_bg.png b/MainModule/src/main/res/mipmap-hdpi/icon_heart_head_bg.png deleted file mode 100644 index 5c0a6157..00000000 Binary files a/MainModule/src/main/res/mipmap-hdpi/icon_heart_head_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_heart_head_bg.webp b/MainModule/src/main/res/mipmap-hdpi/icon_heart_head_bg.webp new file mode 100644 index 00000000..b0a9a2e7 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_heart_head_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_heart_help.png b/MainModule/src/main/res/mipmap-hdpi/icon_heart_help.png deleted file mode 100644 index 0cf0d0dc..00000000 Binary files a/MainModule/src/main/res/mipmap-hdpi/icon_heart_help.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_heart_help.webp b/MainModule/src/main/res/mipmap-hdpi/icon_heart_help.webp new file mode 100644 index 00000000..ff236bf3 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_heart_help.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_heart_item_line.png b/MainModule/src/main/res/mipmap-hdpi/icon_heart_item_line.png deleted file mode 100644 index 6dad0bd1..00000000 Binary files a/MainModule/src/main/res/mipmap-hdpi/icon_heart_item_line.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_heart_item_line.webp b/MainModule/src/main/res/mipmap-hdpi/icon_heart_item_line.webp new file mode 100644 index 00000000..5f56f097 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_heart_item_line.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_heart_top_bg.png b/MainModule/src/main/res/mipmap-hdpi/icon_heart_top_bg.png deleted file mode 100644 index be751260..00000000 Binary files a/MainModule/src/main/res/mipmap-hdpi/icon_heart_top_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_heart_top_bg.webp b/MainModule/src/main/res/mipmap-hdpi/icon_heart_top_bg.webp new file mode 100644 index 00000000..a5a0cd67 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_heart_top_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_jpyj.webp b/MainModule/src/main/res/mipmap-hdpi/icon_jpyj.webp new file mode 100644 index 00000000..3ab8c52f Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_jpyj.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_me_family.webp b/MainModule/src/main/res/mipmap-hdpi/icon_me_family.webp new file mode 100644 index 00000000..8c4f3e8c Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_me_family.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_sj.webp b/MainModule/src/main/res/mipmap-hdpi/icon_sj.webp new file mode 100644 index 00000000..215e9ff6 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_sj.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_slsj.webp b/MainModule/src/main/res/mipmap-hdpi/icon_slsj.webp new file mode 100644 index 00000000..172f8cae Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_slsj.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_user_midd_heart.png b/MainModule/src/main/res/mipmap-hdpi/icon_user_midd_heart.png deleted file mode 100644 index 9509529f..00000000 Binary files a/MainModule/src/main/res/mipmap-hdpi/icon_user_midd_heart.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-hdpi/icon_user_midd_heart.webp b/MainModule/src/main/res/mipmap-hdpi/icon_user_midd_heart.webp new file mode 100644 index 00000000..b451e5ff Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/icon_user_midd_heart.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/net_worth_dialog_bj.webp b/MainModule/src/main/res/mipmap-hdpi/net_worth_dialog_bj.webp new file mode 100644 index 00000000..5787afa9 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/net_worth_dialog_bj.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/sign_num_bg.webp b/MainModule/src/main/res/mipmap-hdpi/sign_num_bg.webp new file mode 100644 index 00000000..e6dfbdf0 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/sign_num_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-hdpi/user_tab_bj.webp b/MainModule/src/main/res/mipmap-hdpi/user_tab_bj.webp new file mode 100644 index 00000000..eae74194 Binary files /dev/null and b/MainModule/src/main/res/mipmap-hdpi/user_tab_bj.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/bg_family_members.webp b/MainModule/src/main/res/mipmap-xhdpi/bg_family_members.webp new file mode 100644 index 00000000..969a07ae Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/bg_family_members.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/bg_net_worth.webp b/MainModule/src/main/res/mipmap-xhdpi/bg_net_worth.webp new file mode 100644 index 00000000..daec9e5d Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/bg_net_worth.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/ic_empty.webp b/MainModule/src/main/res/mipmap-xhdpi/ic_empty.webp new file mode 100644 index 00000000..b7eba266 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/ic_empty.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_cp_tops_bg.png b/MainModule/src/main/res/mipmap-xhdpi/icon_cp_tops_bg.png deleted file mode 100644 index d7c32214..00000000 Binary files a/MainModule/src/main/res/mipmap-xhdpi/icon_cp_tops_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_cp_tops_bg.webp b/MainModule/src/main/res/mipmap-xhdpi/icon_cp_tops_bg.webp new file mode 100644 index 00000000..d320845e Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_cp_tops_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_back.png b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_back.png deleted file mode 100644 index 82c58b8e..00000000 Binary files a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_back.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_back.webp b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_back.webp new file mode 100644 index 00000000..b15854b4 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_back.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_cp_bg.png b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_cp_bg.png deleted file mode 100644 index 3d5ae9ed..00000000 Binary files a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_cp_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_cp_bg.webp b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_cp_bg.webp new file mode 100644 index 00000000..416f4dba Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_cp_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_ex_bg.png b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_ex_bg.png deleted file mode 100644 index 23d27b69..00000000 Binary files a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_ex_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_ex_bg.webp b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_ex_bg.webp new file mode 100644 index 00000000..97a36269 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_ex_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_head_bg.png b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_head_bg.png deleted file mode 100644 index fd7ce173..00000000 Binary files a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_head_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_head_bg.webp b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_head_bg.webp new file mode 100644 index 00000000..f9e40692 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_head_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_help.png b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_help.png deleted file mode 100644 index 3f89abc4..00000000 Binary files a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_help.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_help.webp b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_help.webp new file mode 100644 index 00000000..dfe7b379 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_help.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_item_line.png b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_item_line.png deleted file mode 100644 index 1a808a94..00000000 Binary files a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_item_line.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_item_line.webp b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_item_line.webp new file mode 100644 index 00000000..b0e2f38d Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_item_line.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_top_bg.png b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_top_bg.png deleted file mode 100644 index ba7028ee..00000000 Binary files a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_top_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_heart_top_bg.webp b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_top_bg.webp new file mode 100644 index 00000000..5581dbe0 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_heart_top_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_jpyj.webp b/MainModule/src/main/res/mipmap-xhdpi/icon_jpyj.webp new file mode 100644 index 00000000..74a2a78e Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_jpyj.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_me_family.webp b/MainModule/src/main/res/mipmap-xhdpi/icon_me_family.webp new file mode 100644 index 00000000..72e2467c Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_me_family.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_sj.webp b/MainModule/src/main/res/mipmap-xhdpi/icon_sj.webp new file mode 100644 index 00000000..ae145635 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_sj.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_slsj.webp b/MainModule/src/main/res/mipmap-xhdpi/icon_slsj.webp new file mode 100644 index 00000000..703e8153 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_slsj.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_user_midd_heart.png b/MainModule/src/main/res/mipmap-xhdpi/icon_user_midd_heart.png deleted file mode 100644 index 4feb904b..00000000 Binary files a/MainModule/src/main/res/mipmap-xhdpi/icon_user_midd_heart.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/icon_user_midd_heart.webp b/MainModule/src/main/res/mipmap-xhdpi/icon_user_midd_heart.webp new file mode 100644 index 00000000..11a5cbbe Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/icon_user_midd_heart.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/net_worth_dialog_bj.webp b/MainModule/src/main/res/mipmap-xhdpi/net_worth_dialog_bj.webp new file mode 100644 index 00000000..6e6ba716 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/net_worth_dialog_bj.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/sign_num_bg.webp b/MainModule/src/main/res/mipmap-xhdpi/sign_num_bg.webp new file mode 100644 index 00000000..d124b24a Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/sign_num_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-xhdpi/user_tab_bj.webp b/MainModule/src/main/res/mipmap-xhdpi/user_tab_bj.webp new file mode 100644 index 00000000..a173a5f2 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xhdpi/user_tab_bj.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/bg_family_members.webp b/MainModule/src/main/res/mipmap-xxhdpi/bg_family_members.webp new file mode 100644 index 00000000..3b8fe184 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/bg_family_members.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/bg_net_worth.webp b/MainModule/src/main/res/mipmap-xxhdpi/bg_net_worth.webp new file mode 100644 index 00000000..c7c0b7a2 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/bg_net_worth.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/ic_empty.webp b/MainModule/src/main/res/mipmap-xxhdpi/ic_empty.webp new file mode 100644 index 00000000..7c646a47 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/ic_empty.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_cp_tops_bg.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_cp_tops_bg.png deleted file mode 100644 index 7426a086..00000000 Binary files a/MainModule/src/main/res/mipmap-xxhdpi/icon_cp_tops_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_cp_tops_bg.webp b/MainModule/src/main/res/mipmap-xxhdpi/icon_cp_tops_bg.webp new file mode 100644 index 00000000..40ca1be3 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_cp_tops_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_back.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_back.png deleted file mode 100644 index b4632fc0..00000000 Binary files a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_back.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_back.webp b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_back.webp new file mode 100644 index 00000000..6d41fae4 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_back.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_cp_bg.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_cp_bg.png deleted file mode 100644 index e89673eb..00000000 Binary files a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_cp_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_cp_bg.webp b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_cp_bg.webp new file mode 100644 index 00000000..6cca6fda Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_cp_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_ex_bg.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_ex_bg.png deleted file mode 100644 index 0257d183..00000000 Binary files a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_ex_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_ex_bg.webp b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_ex_bg.webp new file mode 100644 index 00000000..874b61b8 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_ex_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_head_bg.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_head_bg.png deleted file mode 100644 index eabde4f3..00000000 Binary files a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_head_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_head_bg.webp b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_head_bg.webp new file mode 100644 index 00000000..e6a5d830 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_head_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_help.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_help.png deleted file mode 100644 index c2cb6152..00000000 Binary files a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_help.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_help.webp b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_help.webp new file mode 100644 index 00000000..7733589b Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_help.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_item_line.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_item_line.png deleted file mode 100644 index 517f999b..00000000 Binary files a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_item_line.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_item_line.webp b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_item_line.webp new file mode 100644 index 00000000..9d4731d6 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_item_line.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_top_bg.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_top_bg.png deleted file mode 100644 index 72711350..00000000 Binary files a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_top_bg.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_top_bg.webp b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_top_bg.webp new file mode 100644 index 00000000..db075e36 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_heart_top_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_jpyj.webp b/MainModule/src/main/res/mipmap-xxhdpi/icon_jpyj.webp new file mode 100644 index 00000000..1bd26705 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_jpyj.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_me_family.webp b/MainModule/src/main/res/mipmap-xxhdpi/icon_me_family.webp new file mode 100644 index 00000000..e73e1afd Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_me_family.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_sj.webp b/MainModule/src/main/res/mipmap-xxhdpi/icon_sj.webp new file mode 100644 index 00000000..caa32f42 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_sj.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_slsj.webp b/MainModule/src/main/res/mipmap-xxhdpi/icon_slsj.webp new file mode 100644 index 00000000..1506aff0 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_slsj.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_user_midd_heart.png b/MainModule/src/main/res/mipmap-xxhdpi/icon_user_midd_heart.png deleted file mode 100644 index 33fef469..00000000 Binary files a/MainModule/src/main/res/mipmap-xxhdpi/icon_user_midd_heart.png and /dev/null differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/icon_user_midd_heart.webp b/MainModule/src/main/res/mipmap-xxhdpi/icon_user_midd_heart.webp new file mode 100644 index 00000000..297423b8 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/icon_user_midd_heart.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/net_worth_dialog_bj.webp b/MainModule/src/main/res/mipmap-xxhdpi/net_worth_dialog_bj.webp new file mode 100644 index 00000000..902c7904 Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/net_worth_dialog_bj.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/sign_num_bg.webp b/MainModule/src/main/res/mipmap-xxhdpi/sign_num_bg.webp new file mode 100644 index 00000000..b16e130c Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/sign_num_bg.webp differ diff --git a/MainModule/src/main/res/mipmap-xxhdpi/user_tab_bj.webp b/MainModule/src/main/res/mipmap-xxhdpi/user_tab_bj.webp new file mode 100644 index 00000000..8fd5532d Binary files /dev/null and b/MainModule/src/main/res/mipmap-xxhdpi/user_tab_bj.webp differ diff --git a/gradle.properties b/gradle.properties index 0b0b13b2..71918157 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,8 +28,8 @@ isBuildModule=false #org.gradle.deamon=false android.injected.testOnly=false -APP_VERSION_NAME=1.0.6.5 -APP_VERSION_CODE=54 +APP_VERSION_NAME=1.0.6.6 +APP_VERSION_CODE=55 org.gradle.jvm.toolchain.useLegacyAdapters=false #org.gradle.java.home=C\:\\Users\\qx\\.jdks\\ms-17.0.15