diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/ac_exchange.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/ac_exchange.imageset/Contents.json new file mode 100644 index 0000000..3b67a94 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/ac_exchange.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ac_exchange@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/ac_exchange.imageset/ac_exchange@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/ac_exchange.imageset/ac_exchange@2x.png new file mode 100644 index 0000000..5c694cf Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/ac_exchange.imageset/ac_exchange@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_pool.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_pool.imageset/Contents.json index a800ba6..57c2be5 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_pool.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_pool.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 1124@2x.png", + "filename" : "stake_bg_pool@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_pool.imageset/stake_bg_pool@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_pool.imageset/stake_bg_pool@2x.png new file mode 100644 index 0000000..1392c93 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_pool.imageset/stake_bg_pool@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_pool.imageset/组 1124@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_pool.imageset/组 1124@2x.png deleted file mode 100644 index 1f733fc..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_pool.imageset/组 1124@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rank.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rank.imageset/Contents.json index 4242fd3..2cdbb05 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rank.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rank.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 1128@2x.png", + "filename" : "stake_bg_rank@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rank.imageset/stake_bg_rank@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rank.imageset/stake_bg_rank@2x.png new file mode 100644 index 0000000..5f6df8a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rank.imageset/stake_bg_rank@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rank.imageset/组 1128@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rank.imageset/组 1128@2x.png deleted file mode 100644 index 102d1e3..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rank.imageset/组 1128@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_record.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_record.imageset/Contents.json index 4d3053b..492f4ca 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_record.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_record.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 1129@2x.png", + "filename" : "stake_bg_record@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_record.imageset/stake_bg_record@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_record.imageset/stake_bg_record@2x.png new file mode 100644 index 0000000..d7aee27 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_record.imageset/stake_bg_record@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_record.imageset/组 1129@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_record.imageset/组 1129@2x.png deleted file mode 100644 index ceb4e56..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_record.imageset/组 1129@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rule.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rule.imageset/Contents.json index a1773f2..e453469 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rule.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rule.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 1127@2x.png", + "filename" : "stake_bg_rule@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rule.imageset/stake_bg_rule@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rule.imageset/stake_bg_rule@2x.png new file mode 100644 index 0000000..102d3f3 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rule.imageset/stake_bg_rule@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rule.imageset/组 1127@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rule.imageset/组 1127@2x.png deleted file mode 100644 index 95c894c..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_bg_rule.imageset/组 1127@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_countdown_bg.imageset/4e92aab36bb04cb65d1b14456fcb790f5291002abce8-3lmezR_fw1200@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_countdown_bg.imageset/4e92aab36bb04cb65d1b14456fcb790f5291002abce8-3lmezR_fw1200@2x.png deleted file mode 100644 index 16dd0d1..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_countdown_bg.imageset/4e92aab36bb04cb65d1b14456fcb790f5291002abce8-3lmezR_fw1200@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_countdown_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_countdown_bg.imageset/Contents.json index b19ff34..37e4cf9 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_countdown_bg.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_countdown_bg.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "4e92aab36bb04cb65d1b14456fcb790f5291002abce8-3lmezR_fw1200@2x.png", + "filename" : "stake_countdown_bg@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_countdown_bg.imageset/stake_countdown_bg@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_countdown_bg.imageset/stake_countdown_bg@2x.png new file mode 100644 index 0000000..960ff37 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_countdown_bg.imageset/stake_countdown_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_1.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_1.imageset/Contents.json index 583c69d..cf3c279 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_1.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_1.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 1119@2x.png", + "filename" : "stake_name_1@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_1.imageset/stake_name_1@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_1.imageset/stake_name_1@2x.png new file mode 100644 index 0000000..71ad8dc Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_1.imageset/stake_name_1@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_1.imageset/组 1119@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_1.imageset/组 1119@2x.png deleted file mode 100644 index c1c770f..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_1.imageset/组 1119@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_2.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_2.imageset/Contents.json index b2ddbe1..d4564b1 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_2.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_2.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 1120@2x.png", + "filename" : "stake_name_2@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_2.imageset/stake_name_2@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_2.imageset/stake_name_2@2x.png new file mode 100644 index 0000000..9a56984 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_2.imageset/stake_name_2@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_2.imageset/组 1120@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_2.imageset/组 1120@2x.png deleted file mode 100644 index 458dd60..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_2.imageset/组 1120@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_3.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_3.imageset/Contents.json index ef89d78..27a4161 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_3.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_3.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 1121@2x.png", + "filename" : "stake_name_3@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_3.imageset/stake_name_3@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_3.imageset/stake_name_3@2x.png new file mode 100644 index 0000000..e28f624 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_3.imageset/stake_name_3@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_3.imageset/组 1121@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_3.imageset/组 1121@2x.png deleted file mode 100644 index bbad979..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_3.imageset/组 1121@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_4.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_4.imageset/Contents.json index f64365d..5eea878 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_4.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_4.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 1116@2x.png", + "filename" : "stake_name_4@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_4.imageset/stake_name_4@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_4.imageset/stake_name_4@2x.png new file mode 100644 index 0000000..89c2cec Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_4.imageset/stake_name_4@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_4.imageset/组 1116@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_4.imageset/组 1116@2x.png deleted file mode 100644 index 0051a25..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_4.imageset/组 1116@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_5.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_5.imageset/Contents.json index ab3807b..4ee27e0 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_5.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_5.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 1118@2x.png", + "filename" : "stake_name_5@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_5.imageset/stake_name_5@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_5.imageset/stake_name_5@2x.png new file mode 100644 index 0000000..aa99ac5 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_5.imageset/stake_name_5@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_5.imageset/组 1118@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_5.imageset/组 1118@2x.png deleted file mode 100644 index 9975ba4..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_5.imageset/组 1118@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_6.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_6.imageset/Contents.json index 526fe11..aabbd7f 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_6.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_6.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 1117@2x.png", + "filename" : "stake_name_6@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_6.imageset/stake_name_6@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_6.imageset/stake_name_6@2x.png new file mode 100644 index 0000000..0f07f37 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_6.imageset/stake_name_6@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_6.imageset/组 1117@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_6.imageset/组 1117@2x.png deleted file mode 100644 index af4c90d..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/stake_name_6.imageset/组 1117@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/zhuan_stake_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/A_Stake/zhuan_stake_bg.imageset/Contents.json index 6ba0c85..7914608 100644 --- a/QXLive/Other/Assets.xcassets/activity/A_Stake/zhuan_stake_bg.imageset/Contents.json +++ b/QXLive/Other/Assets.xcassets/activity/A_Stake/zhuan_stake_bg.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 1111@2x.png", + "filename" : "zhuan_stake_bg@2x.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/zhuan_stake_bg.imageset/zhuan_stake_bg@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/zhuan_stake_bg.imageset/zhuan_stake_bg@2x.png new file mode 100644 index 0000000..e15fef5 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/A_Stake/zhuan_stake_bg.imageset/zhuan_stake_bg@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/A_Stake/zhuan_stake_bg.imageset/组 1111@2x.png b/QXLive/Other/Assets.xcassets/activity/A_Stake/zhuan_stake_bg.imageset/组 1111@2x.png deleted file mode 100644 index 424c536..0000000 Binary files a/QXLive/Other/Assets.xcassets/activity/A_Stake/zhuan_stake_bg.imageset/组 1111@2x.png and /dev/null differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_bg.imageset/Contents.json new file mode 100644 index 0000000..77b6490 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_bg.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "prize_call_bg.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_bg.imageset/prize_call_bg.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_bg.imageset/prize_call_bg.png new file mode 100644 index 0000000..797108e Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_bg.imageset/prize_call_bg.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift.imageset/Contents.json new file mode 100644 index 0000000..c27b0ad --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_prize_call_box_gift@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift.imageset/room_prize_call_box_gift@2x.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift.imageset/room_prize_call_box_gift@2x.png new file mode 100644 index 0000000..6bea86a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift.imageset/room_prize_call_box_gift@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift_anim_off.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift_anim_off.imageset/Contents.json new file mode 100644 index 0000000..6334c40 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift_anim_off.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "prize_call_box_gift_anim_off.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift_anim_off.imageset/prize_call_box_gift_anim_off.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift_anim_off.imageset/prize_call_box_gift_anim_off.png new file mode 100644 index 0000000..28f86eb Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift_anim_off.imageset/prize_call_box_gift_anim_off.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift_anim_on.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift_anim_on.imageset/Contents.json new file mode 100644 index 0000000..d680c7e --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift_anim_on.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "prize_call_box_gift_anim_on.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift_anim_on.imageset/prize_call_box_gift_anim_on.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift_anim_on.imageset/prize_call_box_gift_anim_on.png new file mode 100644 index 0000000..3b7c270 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_gift_anim_on.imageset/prize_call_box_gift_anim_on.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_1.imageset/1次@2x.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_1.imageset/1次@2x.png new file mode 100644 index 0000000..4d03007 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_1.imageset/1次@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_1.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_1.imageset/Contents.json new file mode 100644 index 0000000..cbc1b7f --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_1.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "1次@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_10.imageset/10次@2x.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_10.imageset/10次@2x.png new file mode 100644 index 0000000..192c9f1 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_10.imageset/10次@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_10.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_10.imageset/Contents.json new file mode 100644 index 0000000..49a4f50 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_10.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "10次@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_20.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_20.imageset/Contents.json new file mode 100644 index 0000000..1a7efe0 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_20.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Mask group@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_20.imageset/Mask group@2x.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_20.imageset/Mask group@2x.png new file mode 100644 index 0000000..d387003 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_open_20.imageset/Mask group@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_rank.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_rank.imageset/Contents.json new file mode 100644 index 0000000..c27b0ad --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_rank.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_prize_call_box_gift@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_rank.imageset/room_prize_call_box_gift@2x.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_rank.imageset/room_prize_call_box_gift@2x.png new file mode 100644 index 0000000..bb53d7e Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_rank.imageset/room_prize_call_box_gift@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_record.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_record.imageset/Contents.json new file mode 100644 index 0000000..0df3bd9 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_record.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_prize_call_box_record@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_record.imageset/room_prize_call_box_record@2x.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_record.imageset/room_prize_call_box_record@2x.png new file mode 100644 index 0000000..e76dd52 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_box_record.imageset/room_prize_call_box_record@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_close.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_close.imageset/Contents.json new file mode 100644 index 0000000..382f815 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_close.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "prize_call_close.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_close.imageset/prize_call_close.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_close.imageset/prize_call_close.png new file mode 100644 index 0000000..87ee0ed Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_close.imageset/prize_call_close.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_open_box.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_open_box.imageset/Contents.json new file mode 100644 index 0000000..8e3cf93 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_open_box.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "prize_call_open_box.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_open_box.imageset/prize_call_open_box.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_open_box.imageset/prize_call_open_box.png new file mode 100644 index 0000000..abb7351 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/爱豆应援箱/room_prize_call_open_box.imageset/prize_call_open_box.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_config.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_config.imageset/Contents.json new file mode 100644 index 0000000..e03fbb4 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_config.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "prize_award_config.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_config.imageset/prize_award_config.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_config.imageset/prize_award_config.png new file mode 100644 index 0000000..e2967b4 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_config.imageset/prize_award_config.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_multiple_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_multiple_bg.imageset/Contents.json new file mode 100644 index 0000000..59c64b4 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_multiple_bg.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "prize_award_multiple_bg.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_multiple_bg.imageset/prize_award_multiple_bg.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_multiple_bg.imageset/prize_award_multiple_bg.png new file mode 100644 index 0000000..7a7fe38 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_multiple_bg.imageset/prize_award_multiple_bg.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_multiple_item.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_multiple_item.imageset/Contents.json new file mode 100644 index 0000000..f98a817 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_multiple_item.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "prize_award_multiple_item.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_multiple_item.imageset/prize_award_multiple_item.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_multiple_item.imageset/prize_award_multiple_item.png new file mode 100644 index 0000000..28b11b2 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_multiple_item.imageset/prize_award_multiple_item.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open1.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open1.imageset/Contents.json new file mode 100644 index 0000000..a35f417 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open1.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "prize_award_open1.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open1.imageset/prize_award_open1.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open1.imageset/prize_award_open1.png new file mode 100644 index 0000000..5038a0d Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open1.imageset/prize_award_open1.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open10.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open10.imageset/Contents.json new file mode 100644 index 0000000..8518ab3 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open10.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "prize_award_open10.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open10.imageset/prize_award_open10.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open10.imageset/prize_award_open10.png new file mode 100644 index 0000000..7b0f3ca Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open10.imageset/prize_award_open10.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open20.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open20.imageset/Contents.json new file mode 100644 index 0000000..8d0f08e --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open20.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "prize_award_open20.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open20.imageset/prize_award_open20.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open20.imageset/prize_award_open20.png new file mode 100644 index 0000000..43051f5 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_open20.imageset/prize_award_open20.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_single_bg.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_single_bg.imageset/Contents.json new file mode 100644 index 0000000..14c1d00 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_single_bg.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "prize_award_single_bg.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_single_bg.imageset/prize_award_single_bg.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_single_bg.imageset/prize_award_single_bg.png new file mode 100644 index 0000000..2dcc5a0 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_single_bg.imageset/prize_award_single_bg.png differ diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_tittle.imageset/Contents.json b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_tittle.imageset/Contents.json new file mode 100644 index 0000000..10d2d75 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_tittle.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "prize_award_tittle.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_tittle.imageset/prize_award_tittle.png b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_tittle.imageset/prize_award_tittle.png new file mode 100644 index 0000000..641fb8e Binary files /dev/null and b/QXLive/Other/Assets.xcassets/activity/爱豆计划/结果/room_prize_result_tittle.imageset/prize_award_tittle.png differ diff --git a/QXLive/Other/Assets.xcassets/room/room_set_room_horse_ac.imageset/Contents.json b/QXLive/Other/Assets.xcassets/room/room_set_room_horse_ac.imageset/Contents.json new file mode 100644 index 0000000..94f7ffa --- /dev/null +++ b/QXLive/Other/Assets.xcassets/room/room_set_room_horse_ac.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_set_room_horse_ac@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_set_room_horse_ac@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/room/room_set_room_horse_ac.imageset/room_set_room_horse_ac@2x.png b/QXLive/Other/Assets.xcassets/room/room_set_room_horse_ac.imageset/room_set_room_horse_ac@2x.png new file mode 100644 index 0000000..6305d0c Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/room_set_room_horse_ac.imageset/room_set_room_horse_ac@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/room/room_set_room_horse_ac.imageset/room_set_room_horse_ac@3x.png b/QXLive/Other/Assets.xcassets/room/room_set_room_horse_ac.imageset/room_set_room_horse_ac@3x.png new file mode 100644 index 0000000..47de5b9 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/room_set_room_horse_ac.imageset/room_set_room_horse_ac@3x.png differ diff --git a/QXLive/Other/Assets.xcassets/room/room_set_room_plan_ac.imageset/Contents.json b/QXLive/Other/Assets.xcassets/room/room_set_room_plan_ac.imageset/Contents.json new file mode 100644 index 0000000..5cbc872 --- /dev/null +++ b/QXLive/Other/Assets.xcassets/room/room_set_room_plan_ac.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_set_room_plan_ac@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_set_room_plan_ac@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/QXLive/Other/Assets.xcassets/room/room_set_room_plan_ac.imageset/room_set_room_plan_ac@2x.png b/QXLive/Other/Assets.xcassets/room/room_set_room_plan_ac.imageset/room_set_room_plan_ac@2x.png new file mode 100644 index 0000000..aa8dd4a Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/room_set_room_plan_ac.imageset/room_set_room_plan_ac@2x.png differ diff --git a/QXLive/Other/Assets.xcassets/room/room_set_room_plan_ac.imageset/room_set_room_plan_ac@3x.png b/QXLive/Other/Assets.xcassets/room/room_set_room_plan_ac.imageset/room_set_room_plan_ac@3x.png new file mode 100644 index 0000000..6140d96 Binary files /dev/null and b/QXLive/Other/Assets.xcassets/room/room_set_room_plan_ac.imageset/room_set_room_plan_ac@3x.png differ diff --git a/QXLive/Other/QXDefine.h b/QXLive/Other/QXDefine.h index b328cfc..ae7db29 100644 --- a/QXLive/Other/QXDefine.h +++ b/QXLive/Other/QXDefine.h @@ -93,6 +93,13 @@ blue:((float)(rgbValue & 0xFF)) / 255.0 alpha:a] #define ScreenWidth ([UIScreen mainScreen].bounds.size.width) #define ScreenHeight ([UIScreen mainScreen].bounds.size.height) +#define iPhoneX \ +({BOOL isPhoneX = NO;\ +if (@available(iOS 11.0, *)) {\ +isPhoneX = [[UIApplication sharedApplication] delegate].window.safeAreaInsets.bottom > 0.0;\ +}\ +(isPhoneX);}) + // 通过十六进制获取色值 #define COLOR16(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16))/255.0 green:((float)((rgbValue & 0xFF00) >> 8))/255.0 blue:((float)(rgbValue & 0xFF))/255.0 alpha:1.0] diff --git a/QXLive/Room(房间)/Controller/QXRoomViewController+Activity.m b/QXLive/Room(房间)/Controller/QXRoomViewController+Activity.m index 345a1a5..7ff3e8a 100644 --- a/QXLive/Room(房间)/Controller/QXRoomViewController+Activity.m +++ b/QXLive/Room(房间)/Controller/QXRoomViewController+Activity.m @@ -18,11 +18,11 @@ -(void)getRoomActivietyStatus{ MJWeakSelf - [QXMineNetwork getRoomActivityStatusSuccessBlock:^(NSArray * _Nonnull list) { - weakSelf.settingView.acList = list; - } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { - - }]; +// [QXMineNetwork getRoomActivityStatusSuccessBlock:^(NSArray * _Nonnull list) { +// weakSelf.settingView.acList = list; +// } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { +// +// }]; } -(void)updateProgress:(NSNotification *)notice{ diff --git a/QXLive/Room(房间)/Controller/QXRoomViewController.m b/QXLive/Room(房间)/Controller/QXRoomViewController.m index f3a5f71..8d58bae 100644 --- a/QXLive/Room(房间)/Controller/QXRoomViewController.m +++ b/QXLive/Room(房间)/Controller/QXRoomViewController.m @@ -43,6 +43,7 @@ #import "QXDrifNobilityJoinRoomView.h" #import "QXRoomViewController+Bar.h" #import "WL_StakeView.h" +#import "JFIdolProjectView.h" @interface QXRoomViewController ()< QXRoomBottomViewDelegate, @@ -1727,6 +1728,12 @@ QXUpSeatViewDelegate [alert showOnView:self.view]; } break; + case QXRoomSettingTypePlanAc:{ + JFIdolProjectView*view = [[JFIdolProjectView alloc] init]; + view.roomId = self.roomId; + [view show]; + } + break; default: break; diff --git a/QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m b/QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m index 37138b9..17b2490 100644 --- a/QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m +++ b/QXLive/Room(房间)/View/用户信息/QXRoomUserInfoView.m @@ -437,7 +437,7 @@ self.moreGiftBtn = [[UIButton alloc] init]; [self.moreGiftBtn setTitleColor:RGB16(0x999999) forState:(UIControlStateNormal)]; - [self.moreGiftBtn setTitle:[NSString localizedStringWithFormat:QXText(@"90天内累计收到%@个礼物"),@"0"] forState:(UIControlStateNormal)]; + [self.moreGiftBtn setTitle:[NSString localizedStringWithFormat:@"累计收到%@个礼物",@"0"] forState:(UIControlStateNormal)]; self.moreGiftBtn.titleLabel.font = [UIFont systemFontOfSize:12]; [self.moreGiftBtn setImage:[[UIImage imageNamed:@"arrowRight"] imageByTintColor:RGB16(0x999999)] forState:(UIControlStateNormal)]; [self.moreGiftBtn addTarget:self action:@selector(eventAction:) forControlEvents:(UIControlEventTouchUpInside)]; @@ -714,7 +714,7 @@ } } [weakSelf.upSeatBtn setTitle:model.is_in_pit.intValue==1?QXText(@"下麦"):QXText(@"抱麦") forState:(UIControlStateNormal)]; - [weakSelf.moreGiftBtn setTitle:[NSString localizedStringWithFormat:QXText(@"90天内累计收到%@个礼物"),model.gift_num] forState:(UIControlStateNormal)]; + [weakSelf.moreGiftBtn setTitle:[NSString localizedStringWithFormat:@"内累计收到%@个礼物",model.gift_num] forState:(UIControlStateNormal)]; [weakSelf.moreGiftBtn qx_layoutButtonNOSizeToFitWithEdgeInsetsStyle:(QXButtonEdgeInsetsStyleRight) imageTitleSpace:2]; weakSelf.introduceLabel.text = model.profile; diff --git a/QXLive/Room(房间)/View/设置/QXRoomSettingView.h b/QXLive/Room(房间)/View/设置/QXRoomSettingView.h index ac1797a..6e58cea 100644 --- a/QXLive/Room(房间)/View/设置/QXRoomSettingView.h +++ b/QXLive/Room(房间)/View/设置/QXRoomSettingView.h @@ -74,6 +74,8 @@ typedef NS_ENUM(NSInteger) { QXRoomSettingTypeRedBagSound = 31, /// 炼仙传说 QXRoomSettingTypeFairyAc = 50, + /// 爱豆计划 + QXRoomSettingTypePlanAc = 51, }QXRoomSettingType; NS_ASSUME_NONNULL_BEGIN @class QXRoomSettingModel; diff --git a/QXLive/Room(房间)/View/设置/QXRoomSettingView.m b/QXLive/Room(房间)/View/设置/QXRoomSettingView.m index 07dd3e4..22b8c34 100644 --- a/QXLive/Room(房间)/View/设置/QXRoomSettingView.m +++ b/QXLive/Room(房间)/View/设置/QXRoomSettingView.m @@ -96,6 +96,8 @@ @property (nonatomic,strong)QXRoomSettingModel *timeAc; /// 炼仙传说 @property (nonatomic,strong)QXRoomSettingModel *fairyAc; +/// 爱豆计划 +@property (nonatomic,strong)QXRoomSettingModel *planAc; /// 红包声音 @property (nonatomic,strong)QXRoomSettingModel *redBagSound; @@ -111,6 +113,10 @@ @property (nonatomic,strong)QXAlertView *alertView; @property (nonatomic,strong)QXDatePickerView* pickerView; + +@property (nonatomic,strong)NSMutableArray* acArray; + +@property (nonatomic,assign)BOOL hasAc; @end @implementation QXRoomSettingView @@ -210,7 +216,7 @@ // toolsArr = @[self.roomSubsidy,self.roomMessage,self.roomOrderMic,self.roomBgMusic,self.roomBgImage]; /// 暂时不需要房间补贴 toolsArr = @[self.roomMessage,self.roomOrderMic,self.roomBgImage,self.roomTime]; - moreArr = @[self.redBag,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport]; + moreArr = @[self.redBag,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport,self.redBagSound]; } self.titles = @[QXText(@"房间类型"),QXText(@"常用工具"),QXText(@"更多操作")]; @@ -220,7 +226,7 @@ // 观众 更多操作 不区分麦上麦下 roomTypeArr = @[]; toolsArr = @[]; - moreArr = @[self.redBag,self.roomEffects,self.drifPop,self.roomReport]; + moreArr = @[self.redBag,self.roomEffects,self.drifPop,self.roomReport,self.redBagSound]; self.titles = @[QXText(@"更多操作")]; } break; @@ -241,7 +247,7 @@ /// 暂时不需要房间补贴 toolsArr = @[self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgImage,self.roomTime]; } - moreArr = @[self.redBag,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport]; + moreArr = @[self.redBag,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport,self.redBagSound]; // roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend]; self.titles = @[QXText(@"房间类型"),QXText(@"常用工具"),QXText(@"更多操作")]; } @@ -264,7 +270,7 @@ toolsArr = @[self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgImage,self.roomTime]; } // roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend]; - moreArr = @[self.redBag,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport]; + moreArr = @[self.redBag,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport,self.redBagSound]; self.titles = @[QXText(@"房间类型"),QXText(@"常用工具"),QXText(@"更多操作")]; } break; @@ -276,36 +282,86 @@ QXText(@"常用工具"):toolsArr, QXText(@"更多操作"):moreArr }]; - [self updateAcTools]; + [self.tableView reloadData]; } --(void)setAcList:(NSArray *)acList{ - _acList = acList; - [self updateAcTools]; +//-(void)setAcList:(NSArray *)acList{ +//// _acList = acList; +//// [self updateAcTools]; +//} +-(void)getRoomActivietyStatus{ + MJWeakSelf + [QXMineNetwork getRoomActivityStatusSuccessBlock:^(NSArray * _Nonnull list) { + weakSelf.acList = [NSArray arrayWithArray:list]; + [weakSelf updateAcTools]; + } failBlock:^(NSError * _Nonnull error, NSString * _Nonnull msg) { + + }]; } - -(void)updateAcTools{ - NSMutableArray *arr = [NSMutableArray arrayWithArray:[self.dataDict objectForKey:@"更多操作"]]; + self.hasAc = NO; for (QXRoomActivityStatusModel *md in self.acList) { if ([md.gift_bag_id isEqualToString:@"11"]) { if (md.status.intValue == 1) { - if (![arr containsObject:self.ageAc]) { - [arr addObject:self.ageAc]; + if (![self.acArray containsObject:self.ageAc]) { + [self.acArray addObject:self.ageAc]; } + self.hasAc = YES; } }else if ([md.gift_bag_id isEqualToString:@"12"]) { if (md.status.intValue == 1) { - if (![arr containsObject:self.timeAc]) { - [arr addObject:self.timeAc]; + if (![self.acArray containsObject:self.timeAc]) { + [self.acArray addObject:self.timeAc]; } + self.hasAc = YES; + } + }else if ([md.gift_bag_id isEqualToString:@"60"]) { + if (md.status.intValue == 1) { + if (![self.acArray containsObject:self.fairyAc]) { + [self.acArray addObject:self.fairyAc]; + } + self.hasAc = YES; + } + }else if ([md.gift_bag_id isEqualToString:@"61"]) { + if (md.status.intValue == 1) { + if (![self.acArray containsObject:self.planAc]) { + [self.acArray addObject:self.planAc]; + } + self.hasAc = YES; } } + } - [arr addObject:self.fairyAc]; - [arr addObject:self.redBagSound]; - [self.dataDict setObject:[NSArray arrayWithArray:arr] forKey:@"更多操作"]; +//#if DEBUG +// if (![self.acArray containsObject:self.fairyAc]) { +// [self.acArray addObject:self.fairyAc]; +// } +// if (![self.acArray containsObject:self.planAc]) { +// [self.acArray addObject:self.planAc]; +// } +//#endif + NSMutableArray *arr = [NSMutableArray arrayWithArray:self.titles]; + if (self.hasAc) { + if (![arr containsObject:@"趣味活动"]) { + [arr addObject:@"趣味活动"]; + } + self.bgView.height = ScaleWidth(407)+kSafeAreaBottom+ScaleWidth(54)+30; + }else{ + self.bgView.height = ScaleWidth(407)+kSafeAreaBottom; + if (![arr containsObject:@"趣味活动"]) { + [arr removeObject:@"趣味活动"]; + } + } + self.titles = [NSArray arrayWithArray:arr]; + self.bgView.y = SCREEN_HEIGHT - self.bgView.height; + self.topView.frame = CGRectMake(16, 0, SCREEN_WIDTH-16*2, ScaleWidth(54)); + self.bottomBgView.frame = CGRectMake(0, self.topView.bottom+4, self.width, self.bgView.height-self.topView.bottom-4); + [self.bottomBgView addRoundedCornersWithRadius:16 byRoundingCorners:(UIRectCornerTopLeft|UIRectCornerTopRight)]; + self.tableView.frame = CGRectMake(0, 10, self.width, self.bottomBgView.height-10); + [self.dataDict setObject:[NSArray arrayWithArray:self.acArray] forKey:@"趣味活动"]; + [self.tableView reloadData]; } -(BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch{ @@ -463,9 +519,10 @@ } -(void)showInView:(UIView *)view{ + [self getRoomActivietyStatus]; [view addSubview:self]; [UIView animateWithDuration:0.3 animations:^{ - self.bgView.y = SCREEN_HEIGHT- ScaleWidth(407)-kSafeAreaBottom; + self.bgView.y = SCREEN_HEIGHT-self.bgView.height; }]; } @@ -742,12 +799,21 @@ -(QXRoomSettingModel *)fairyAc{ if (!_fairyAc) { _fairyAc = [[QXRoomSettingModel alloc] init]; - _fairyAc.icon = @"room_set_room_time_ac"; - _fairyAc.name = @"炼仙传说"; + _fairyAc.icon = @"room_set_room_horse_ac"; + _fairyAc.name = @"马迎新春"; _fairyAc.type = QXRoomSettingTypeFairyAc; } return _fairyAc; } +-(QXRoomSettingModel *)planAc{ + if (!_planAc) { + _planAc = [[QXRoomSettingModel alloc] init]; + _planAc.icon = @"room_set_room_plan_ac"; + _planAc.name = @"爱豆计划"; + _planAc.type = QXRoomSettingTypePlanAc; + } + return _planAc; +} -(QXRoomSettingModel *)roomTime{ if (!_roomTime) { _roomTime = [[QXRoomSettingModel alloc] init]; @@ -807,7 +873,12 @@ } return _pickerView; } - +-(NSMutableArray *)acArray{ + if (!_acArray) { + _acArray = [NSMutableArray array]; + } + return _acArray; +} -(void)setRoomTimeWithStartTime:(NSString*)startTime endTime:(NSString*)endTime{ MJWeakSelf [QXMineNetwork roomSetTimeWithRoomId:self.roomModel.room_info.room_id start_time:startTime end_time:endTime successBlock:^(NSDictionary * _Nonnull dict) { diff --git a/QXLive/活动/时空之巅/QXTimePraizePoolView.h b/QXLive/活动/时空之巅/QXTimePraizePoolView.h index 680bf70..3d45e7e 100644 --- a/QXLive/活动/时空之巅/QXTimePraizePoolView.h +++ b/QXLive/活动/时空之巅/QXTimePraizePoolView.h @@ -10,6 +10,8 @@ NS_ASSUME_NONNULL_BEGIN @interface QXTimePraizePoolView : UIView +/// 61 爱豆计划 12 时空之巅 +@property (nonatomic,strong)NSString *gift_bag_id; @property (nonatomic,strong)NSString *roomId; -(void)showInView:(UIView *)view; @end diff --git a/QXLive/活动/时空之巅/QXTimePraizePoolView.m b/QXLive/活动/时空之巅/QXTimePraizePoolView.m index a8ba836..e31b482 100644 --- a/QXLive/活动/时空之巅/QXTimePraizePoolView.m +++ b/QXLive/活动/时空之巅/QXTimePraizePoolView.m @@ -67,7 +67,7 @@ } MJWeakSelf NSString *server = QXGlobal.shareGlobal.currentServer; - [[QXRequset shareInstance] postWithUrl:[NSString stringWithFormat:@"%@%@",server,@"api/BlindBoxTurntable/get_gift_list"] parameters:@{@"gift_bag_id":@"12",@"room_id":self.roomId?self.roomId:@""} needCache:NO success:^(id responseObject) { + [[QXRequset shareInstance] postWithUrl:[NSString stringWithFormat:@"%@%@",server,@"api/BlindBoxTurntable/get_gift_list"] parameters:@{@"gift_bag_id":self.gift_bag_id?:@"12",@"room_id":self.roomId?self.roomId:@""} needCache:NO success:^(id responseObject) { QXGiftActivityModel *model = [QXGiftActivityModel yy_modelWithJSON:responseObject[@"data"]]; weakSelf.model = model; [self.collectionView reloadData]; diff --git a/QXLive/活动/时空之巅/QXTimePraizeRecordView.h b/QXLive/活动/时空之巅/QXTimePraizeRecordView.h index 3dee6e6..0c53dff 100644 --- a/QXLive/活动/时空之巅/QXTimePraizeRecordView.h +++ b/QXLive/活动/时空之巅/QXTimePraizeRecordView.h @@ -10,6 +10,8 @@ NS_ASSUME_NONNULL_BEGIN @interface QXTimePraizeRecordView : UIView +/// 61 爱豆计划 12 时空之巅 +@property (nonatomic,strong)NSString *gift_bag_id; @property (nonatomic,strong)NSString *roomId; -(void)showInView:(UIView *)view; @end diff --git a/QXLive/活动/时空之巅/QXTimePraizeRecordView.m b/QXLive/活动/时空之巅/QXTimePraizeRecordView.m index afec656..47ada2a 100644 --- a/QXLive/活动/时空之巅/QXTimePraizeRecordView.m +++ b/QXLive/活动/时空之巅/QXTimePraizeRecordView.m @@ -115,7 +115,7 @@ } MJWeakSelf NSDictionary *parameters = @{ - @"gift_bag_id":@"12", + @"gift_bag_id":self.gift_bag_id?:@"12", @"page":[NSNumber numberWithInteger:self.page] }; NSString *server = QXGlobal.shareGlobal.currentServer; diff --git a/QXLive/活动/炼仙传说/WL_StakeView.m b/QXLive/活动/炼仙传说/WL_StakeView.m index 8ec4001..c113381 100644 --- a/QXLive/活动/炼仙传说/WL_StakeView.m +++ b/QXLive/活动/炼仙传说/WL_StakeView.m @@ -27,6 +27,7 @@ #import "QGVAPWrapView+download.h" #import "SVGAPlayer/SVGA.h" #import "UIViewController+CurViewController.h" +#import "QXDiamondViewController.h" @interface WL_StakeView () @@ -251,7 +252,7 @@ - (void)fetchData { NSDictionary *params = @{}; - [[QXRequset shareInstance] postWithUrl:@"/api/monster/get_monster_info" parameters:params needCache:NO success:^(id responseObject) { + [[QXRequset shareInstance] getWithUrl:@"/api/monster/get_monster_info" parameters:params needCache:NO success:^(id responseObject) { WLStakeModel *model = [WLStakeModel mj_objectWithKeyValues:responseObject[@"data"]]; self.unitPrice = model.open_monster_price; self.remainPrice = model.integral; @@ -274,7 +275,7 @@ self.balanceL.text = [NSString stringWithFormat:@"%@", model.integral]; [self onUpdateCurrentNumUI:model]; } fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) { - + [SVProgressHUD showInfoWithStatus:msg]; }]; } @@ -353,16 +354,21 @@ // }]; } -(void)finehouseAcNotice:(NSNotification *)noti { - NSDictionary *dataDict = noti.userInfo; - NSString *code = [NSString stringWithFormat:@"%@",dataDict[@"code"]]; - if ([code isEqualToString:@"3031"]) { - //全服播报 探索开始播报 - [self onSocketStart:dataDict[@"msg"]]; - }else if ([code isEqualToString:@"3032"]){ - [self onSocketResult:dataDict[@"msg"]]; - }else if ([code isEqualToString:@"3033"]){ - [self onSocketEnd:dataDict[@"msg"]]; + NSDictionary *dict = noti.userInfo; + id object = dict[@"msg"]; + if ([object isKindOfClass:[NSDictionary class]]) { + NSDictionary *dataDict = object; + NSString *code = [NSString stringWithFormat:@"%@",dataDict[@"code"]]; + if ([code isEqualToString:@"3031"]) { + //全服播报 探索开始播报 + [self onSocketStart:dataDict[@"data"]]; + }else if ([code isEqualToString:@"3032"]){ + [self onSocketResult:dataDict[@"data"]]; + }else if ([code isEqualToString:@"3033"]){ + [self onSocketEnd:dataDict[@"data"]]; + } } + } - (void)onSocketStart:(NSDictionary *)dataDict { [self.failureView remove]; @@ -401,8 +407,7 @@ } - (void)onSocketResult:(NSDictionary *)dataDict { - NSLog(@"抽奖结果--%@", dataDict); - if (self.resultDict == nil) { + if (self.resultDict == nil) { self.resultDict = dataDict; WLStakeModel *model = [WLStakeModel mj_objectWithKeyValues:dataDict]; if (model.is_win == 1) { @@ -512,6 +517,11 @@ - (IBAction)shouqiBangMethod:(id)sender { [self buttonClickMethod:603]; } +- (IBAction)exchangeAction:(id)sender { + QXDiamondViewController *vc = [[QXDiamondViewController alloc] init]; + [self.viewController.navigationController pushViewController:vc animated:YES]; + [self removeFromSuperview]; +} //本期奖池 - (IBAction)benQiJiangChiMethod:(id)sender { diff --git a/QXLive/活动/炼仙传说/WL_StakeView.xib b/QXLive/活动/炼仙传说/WL_StakeView.xib index a534a83..31e9d04 100644 --- a/QXLive/活动/炼仙传说/WL_StakeView.xib +++ b/QXLive/活动/炼仙传说/WL_StakeView.xib @@ -61,13 +61,13 @@ @@ -128,13 +128,13 @@ @@ -195,13 +195,13 @@ @@ -262,13 +262,13 @@ @@ -329,13 +329,13 @@ @@ -396,13 +396,13 @@ @@ -493,16 +493,16 @@ - + - - + + @@ -555,13 +567,14 @@ + - - + + @@ -620,16 +633,17 @@ + - - - - - - - + + + + + + + diff --git a/QXLive/活动/爱豆计划/Main/JFIdolProjectView.h b/QXLive/活动/爱豆计划/Main/JFIdolProjectView.h new file mode 100755 index 0000000..25d98b6 --- /dev/null +++ b/QXLive/活动/爱豆计划/Main/JFIdolProjectView.h @@ -0,0 +1,20 @@ +// +// JFIdolProjectView.h +// VoiceChat +// +// Created by feng on 2020/9/6. +// Copyright © 2020 NoCardData. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface JFIdolProjectView : UIView +@property (nonatomic,strong)NSString*roomId; +- (void)show; ++ (void)show; + +@end + +NS_ASSUME_NONNULL_END diff --git a/QXLive/活动/爱豆计划/Main/JFIdolProjectView.m b/QXLive/活动/爱豆计划/Main/JFIdolProjectView.m new file mode 100755 index 0000000..774640c --- /dev/null +++ b/QXLive/活动/爱豆计划/Main/JFIdolProjectView.m @@ -0,0 +1,345 @@ +// +// JFIdolProjectView.m +// VoiceChat +// +// Created by feng on 2020/9/6. +// Copyright © 2020 NoCardData. All rights reserved. +// + +#import "JFIdolProjectView.h" +#import "SVGAParser.h" +#import "SVGAImageView.h" +#import "SVGAVideoEntity.h" +#import "JFIdolProjectResultView.h" +#import "QXTimePraizeRuleView.h" +#import "QXTimePraizePoolView.h" +#import "QXTimePraizeRecordView.h" + +@interface JFIdolProjectView () +@property (weak, nonatomic) IBOutlet UIView *bgView; + +@property (weak, nonatomic) IBOutlet SVGAImageView *svgaBoxView; +@property (weak, nonatomic) IBOutlet SVGAImageView *svgaOpenBoxView; + +@property (weak, nonatomic) IBOutlet UIButton *openBtn1; +@property (weak, nonatomic) IBOutlet UIButton *openBtn2; +@property (weak, nonatomic) IBOutlet UIButton *openBtn3; + +@property (weak, nonatomic) IBOutlet UIButton *giftAnimationBtn; + +@property (weak, nonatomic) IBOutlet NSLayoutConstraint *bottom_contentView; + +@property (weak, nonatomic) IBOutlet UILabel *goldBalanceLabel; + +@property (nonatomic,assign) BOOL isShowingSvga; +@property (nonatomic,assign) BOOL isRequesting; +@property (weak, nonatomic) IBOutlet UIButton *onePriceBtn; +@property (weak, nonatomic) IBOutlet UIButton *tenPriceBtn; +@property (weak, nonatomic) IBOutlet UIButton *twentyPriceBtn; + +@property (nonatomic, strong) NSArray *models; +@property (nonatomic, strong) NSMutableArray *allGiftArray; +@property (assign,nonatomic) NSInteger againType; +@property (nonatomic, strong)QXTimePraizeRuleView *ruleView; +@property (nonatomic, strong)QXTimePraizePoolView *poolView; +@property (nonatomic, strong)QXTimePraizeRecordView *recordView; +@property (nonatomic, strong)QXGiftActivityModel *model; +@end + +@implementation JFIdolProjectView +- (instancetype)init +{ + self = [super init]; + if (self) { + self = [[NSBundle mainBundle] loadNibNamed:@"JFIdolProjectView" owner:self options:nil][0]; + self.frame = CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + self.giftAnimationBtn.selected = ![[NSUserDefaults standardUserDefaults] boolForKey:@"CloseIdolBoxAnimation"]; + + [self addNotification]; + + self.svgaOpenBoxView.delegate = self; + + self.bgView.alpha = 0; + self.bottom_contentView.constant = -(iPhoneX ? 380 : 360); + [self layoutIfNeeded]; + } + return self; +} +-(void)show{ + [self getGiftList]; + [self getMyWallet]; + [[UIApplication sharedApplication].keyWindow addSubview:self]; + [UIView animateWithDuration:0.28 animations:^{ + self.bgView.alpha = 1; + self.bottom_contentView.constant = (iPhoneX ? 0 : -20); + [self layoutIfNeeded]; + } completion:^(BOOL finished) { + + }]; +} ++ (void)show +{ + JFIdolProjectView *view = [[NSBundle mainBundle] loadNibNamed:@"JFIdolProjectView" owner:self options:nil][0]; + view.frame = CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + [[UIApplication sharedApplication].keyWindow addSubview:view]; + + view.giftAnimationBtn.selected = ![[NSUserDefaults standardUserDefaults] boolForKey:@"CloseIdolBoxAnimation"]; + + [view addNotification]; + + view.svgaOpenBoxView.delegate = view; + + view.bgView.alpha = 0; + view.bottom_contentView.constant = -(iPhoneX ? 380 : 360); + [view layoutIfNeeded]; + [UIView animateWithDuration:0.28 animations:^{ + view.bgView.alpha = 1; + view.bottom_contentView.constant = (iPhoneX ? 0 : -20); + [view layoutIfNeeded]; + } completion:^(BOOL finished) { + + }]; +} + +- (void)dealloc +{ + [[NSNotificationCenter defaultCenter] removeObserver:self]; +} + +- (void)addNotification +{ + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onClickCloseBtn:) name:@"CloseRoomDialogView" object:nil]; +} + +#pragma mark - Event +/// 关闭视图 +- (IBAction)onClickCloseBtn:(id)sender +{ + [UIView animateWithDuration:0.28 animations:^{ + self.bgView.alpha = 0; + self.bottom_contentView.constant = -(iPhoneX ? 380 : 360); + [self layoutIfNeeded]; + } completion:^(BOOL finished) { + [self removeFromSuperview]; + }]; +} + +/// 开启1次 +- (IBAction)onClickOpenBtn1:(id)sender +{ + [self openWishAction:1]; +} + +/// 开启10次 +- (IBAction)onClickOpenBtn2:(id)sender +{ + [self openWishAction:10]; +} + +/// 开启20次 +- (IBAction)onClickOpenBtn3:(id)sender +{ + [self openWishAction:20]; +} + +/// 助力能量 +- (IBAction)onTapEnergyView:(id)sender { + [self onClickCloseBtn:nil]; +} + +/// 排行 +- (IBAction)onClickRankBtn:(id)sender +{ + self.ruleView.rule = self.model.rule_url; + [self.ruleView showInView:self]; +} + +/// 礼品 +- (IBAction)onClickGiftBtn:(id)sender +{ + self.poolView.roomId = self.roomId; + self.poolView.gift_bag_id = @"61"; + [self.poolView showInView:self]; +} + +/// 记录 +- (IBAction)onClickRecordBtn:(id)sender +{ + self.recordView.roomId = self.roomId; + self.recordView.gift_bag_id = @"61"; + [self.recordView showInView:self]; +} + +/// 礼物动画开关 +- (IBAction)onClickAnimationSwitchBtn:(id)sender +{ + self.giftAnimationBtn.selected = !self.giftAnimationBtn.selected; + [[NSUserDefaults standardUserDefaults] setBool:!self.giftAnimationBtn.selected forKey:@"CloseIdolBoxAnimation"]; +} + +- (void)setWishBtnUserinterface:(BOOL)canTap +{ + self.openBtn1.userInteractionEnabled = canTap; + self.openBtn2.userInteractionEnabled = canTap; + self.openBtn3.userInteractionEnabled = canTap; +} + +#pragma mark - Svga动画 +- (void)startOpenBoxAnimation +{ + self.isShowingSvga = YES; + + [self.svgaOpenBoxView stopAnimation]; + + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.25 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + self.svgaBoxView.alpha = 0; + }); + + self.svgaOpenBoxView.imageName = @"prize_call_open_box"; +} + +- (void)svgaPlayerDidFinishedAnimation:(SVGAPlayer *)player +{ + self.isShowingSvga = NO; + + self.svgaBoxView.alpha = 1; + + [self checkHadShowResult]; +} + +#pragma mark - Network +- (void)openWishAction:(NSInteger)type +{ + if (self.isRequesting) { + return; + } + + self.isShowingSvga = YES; + self.isRequesting = YES; + if (self.giftAnimationBtn.selected) { + [self startOpenBoxAnimation]; + } + [self setWishBtnUserinterface:NO]; + + __weak typeof(self) weakSelf = self; +// [JFHttpRequestHelper wish:type success:^(id data) { +// +// weakSelf.againType = type; +// weakSelf.isRequesting = NO; +// weakSelf.models = [data copy]; +// +// if (!weakSelf.giftAnimationBtn.selected) { +// [weakSelf checkHadShowResult]; +// } +// +// } failure:^(NSNumber *code, NSString *msg) { +// weakSelf.isRequesting = NO; +// [weakSelf setWishBtnUserinterface:YES]; +// }]; + [self drawGiftWithNum:[NSString stringWithFormat:@"%ld",type]]; +} +-(void)drawGiftWithNum:(NSString*)num{ + NSDictionary *parameters = @{ + @"gift_bag_id":@"61", + @"room_id":self.roomId, + @"num":num, + }; + MJWeakSelf + NSString *server = QXGlobal.shareGlobal.currentServer; + [[QXRequset shareInstance] postWithUrl:[NSString stringWithFormat:@"%@%@",server,@"api/BlindBoxTurntable/draw_gift"] parameters:parameters needCache:NO success:^(id responseObject) { + weakSelf.isRequesting = NO; + weakSelf.againType = num.integerValue; + QXDrawGiftResultModel *model = [QXDrawGiftResultModel yy_modelWithJSON:responseObject[@"data"]]; + weakSelf.models = model.reslut_list; + [weakSelf getMyWallet]; + if (!weakSelf.giftAnimationBtn.selected) { + [weakSelf checkHadShowResult]; + } + } fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) { + weakSelf.isRequesting = NO; + [weakSelf setWishBtnUserinterface:YES]; + showToast(msg); + }]; +} +-(void)getGiftList{ + if (![self.roomId isExist]) { + return; + } +// if (self.model) { +// return; +// } + MJWeakSelf + NSString *server = QXGlobal.shareGlobal.currentServer; + [[QXRequset shareInstance] postWithUrl:[NSString stringWithFormat:@"%@%@",server,@"api/BlindBoxTurntable/get_gift_list"] parameters:@{@"gift_bag_id":@"61",@"room_id":self.roomId?self.roomId:@""} needCache:NO success:^(id responseObject) { + QXGiftActivityModel *model = [QXGiftActivityModel yy_modelWithJSON:responseObject[@"data"]]; + weakSelf.model = model; + [weakSelf.onePriceBtn setTitle:[NSString stringWithFormat:@"%@币",model.box_price] forState:(UIControlStateNormal)]; + [weakSelf.tenPriceBtn setTitle:[NSString stringWithFormat:@"%ld币",model.box_price.integerValue*10] forState:(UIControlStateNormal)]; + [weakSelf.twentyPriceBtn setTitle:[NSString stringWithFormat:@"%ld币",model.box_price.integerValue*20] forState:(UIControlStateNormal)]; + } fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) { + + }]; + +} +-(void)getMyWallet{ + MJWeakSelf + [[QXRequset shareInstance] getWithUrl:QXWallet parameters:@{@"token":[QXGlobal shareGlobal].loginModel.token?[QXGlobal shareGlobal].loginModel.token:@""} needCache:NO success:^(id responseObject) { + double coin = [responseObject[@"data"][@"coin"] doubleValue]; + NSString *coinStr = [NSString stringWithFormat:@"%.2f",coin]; + weakSelf.goldBalanceLabel.text = coinStr; +// [weakSelf.coinBtn setTitle:[NSString stringWithFormat:@" %@",coinStr] forState:(UIControlStateNormal)]; +// [weakSelf.coinBtn sizeToFit]; +// CGFloat allWidth = weakSelf.coinBtn.width + self.exchangeBtn.width+15; +// weakSelf.coinView.width = allWidth; +// weakSelf.coinView.x = (weakSelf.bgView.width-allWidth)/2; +// weakSelf.coinBtn.frame = CGRectMake(10, 0, weakSelf.coinBtn.width, weakSelf.coinView.height); +// weakSelf.exchangeBtn.frame = CGRectMake(allWidth-weakSelf.exchangeBtn.width, 0, weakSelf.exchangeBtn.width, weakSelf.coinView.height); +// weakSelf.coin = coin; +// [weakSelf configBtnStatus]; + } fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) { + + }]; +} +/// 显示开箱子结果弹窗视图 +- (void)checkHadShowResult +{ + if (self.isRequesting) { + return; + } + + if (self.models) { + __weak typeof(self) weakSelf = self; + [JFIdolProjectResultView showWish:self.models roomId:self.roomId againType:self.againType buyBlock:^(NSInteger type) { + [weakSelf openWishAction:type]; + } refreshWalletBlock:^{ + [weakSelf getMyWallet]; + }]; + self.models = nil; + [self setWishBtnUserinterface:YES]; + } +} +-(NSMutableArray *)allGiftArray{ + if (!_allGiftArray) { + _allGiftArray = [NSMutableArray array]; + } + return _allGiftArray; +} +-(QXTimePraizeRuleView *)ruleView{ + if (!_ruleView) { + _ruleView = [[QXTimePraizeRuleView alloc] init]; + } + return _ruleView; +} +-(QXTimePraizePoolView *)poolView{ + if (!_poolView) { + _poolView = [[QXTimePraizePoolView alloc] init]; + } + return _poolView; +} +-(QXTimePraizeRecordView *)recordView{ + if (!_recordView) { + _recordView = [[QXTimePraizeRecordView alloc] init]; + } + return _recordView; +} +@end diff --git a/QXLive/活动/爱豆计划/Main/JFIdolProjectView.xib b/QXLive/活动/爱豆计划/Main/JFIdolProjectView.xib new file mode 100755 index 0000000..1c5af73 --- /dev/null +++ b/QXLive/活动/爱豆计划/Main/JFIdolProjectView.xib @@ -0,0 +1,270 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/QXLive/活动/爱豆计划/Result/JFIdolProjectResultCell.h b/QXLive/活动/爱豆计划/Result/JFIdolProjectResultCell.h new file mode 100755 index 0000000..a3bbb67 --- /dev/null +++ b/QXLive/活动/爱豆计划/Result/JFIdolProjectResultCell.h @@ -0,0 +1,19 @@ +// +// JFIdolProjectResultCell.h +// VoiceChat +// +// Created by Mc on 2020/4/16. +// + +#import +//#import "JFLotteryResultItem.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface JFIdolProjectResultCell : UICollectionViewCell + +@property (nonatomic,strong) QXDrawGiftModel *model; + +@end + +NS_ASSUME_NONNULL_END diff --git a/QXLive/活动/爱豆计划/Result/JFIdolProjectResultCell.m b/QXLive/活动/爱豆计划/Result/JFIdolProjectResultCell.m new file mode 100755 index 0000000..a6de569 --- /dev/null +++ b/QXLive/活动/爱豆计划/Result/JFIdolProjectResultCell.m @@ -0,0 +1,27 @@ +// +// JFIdolProjectResultCell.m +// VoiceChat +// +// Created by Mc on 2020/4/16. +// + +#import "JFIdolProjectResultCell.h" + +@interface JFIdolProjectResultCell () + +@property (weak, nonatomic) IBOutlet UIImageView *logoImageView; +@property (weak, nonatomic) IBOutlet UILabel *nameLabel; + +@end + +@implementation JFIdolProjectResultCell + +- (void)setModel:(QXDrawGiftModel *)model +{ + _model = model; + + [self.logoImageView sd_setImageWithURL:[NSURL URLWithString:model.base_image]]; + self.nameLabel.text = [NSString stringWithFormat:@"%@*%@", model.gift_name, model.count]; +} + +@end diff --git a/QXLive/活动/爱豆计划/Result/JFIdolProjectResultCell.xib b/QXLive/活动/爱豆计划/Result/JFIdolProjectResultCell.xib new file mode 100755 index 0000000..f9b21fb --- /dev/null +++ b/QXLive/活动/爱豆计划/Result/JFIdolProjectResultCell.xib @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/QXLive/活动/爱豆计划/Result/JFIdolProjectResultView.h b/QXLive/活动/爱豆计划/Result/JFIdolProjectResultView.h new file mode 100755 index 0000000..12f83d4 --- /dev/null +++ b/QXLive/活动/爱豆计划/Result/JFIdolProjectResultView.h @@ -0,0 +1,20 @@ +// +// JFIdolProjectResultView.h +// VoiceChat +// +// Created by Mc on 2020/4/16. +// + +#import +//#import "JFLotteryResultItem.h" +typedef void(^JFRoomWishAgain)(NSInteger type); +typedef void(^JFRefreshWallet)(void); +NS_ASSUME_NONNULL_BEGIN + +@interface JFIdolProjectResultView : UIView + ++ (void)showWish:(NSArray *)models roomId:(NSString*)roomId againType:(NSInteger)againType buyBlock:(JFRoomWishAgain)buyBlock refreshWalletBlock:(JFRefreshWallet)refreshWalletBlock; + +@end + +NS_ASSUME_NONNULL_END diff --git a/QXLive/活动/爱豆计划/Result/JFIdolProjectResultView.m b/QXLive/活动/爱豆计划/Result/JFIdolProjectResultView.m new file mode 100755 index 0000000..3573273 --- /dev/null +++ b/QXLive/活动/爱豆计划/Result/JFIdolProjectResultView.m @@ -0,0 +1,297 @@ +// +// JFIdolProjectResultView.m +// VoiceChat +// +// Created by Mc on 2020/4/16. +// + +#import "JFIdolProjectResultView.h" +#import "JFIdolProjectResultCell.h" + +@interface JFIdolProjectResultView () + +//多次许愿 +@property (weak, nonatomic) IBOutlet UIView *moreResultView; +@property (weak, nonatomic) IBOutlet UICollectionView *collectionView; +@property (weak, nonatomic) IBOutlet UIButton *moreSureBtn; +@property (weak, nonatomic) IBOutlet UIButton *moreWishBtn20; + +//单次许愿 +@property (weak, nonatomic) IBOutlet UIView *oneBgView; +@property (weak, nonatomic) IBOutlet UIImageView *oneImageView; +@property (weak, nonatomic) IBOutlet UILabel *oneLabel; +@property (weak, nonatomic) IBOutlet UIButton *wishBtn1; + +@property (strong,nonatomic) NSArray *models; +@property (copy,nonatomic) JFRoomWishAgain buyBlock; +@property (copy,nonatomic) JFRefreshWallet refreshWalletBlock; + +@property (assign,nonatomic) NSInteger againType; + +@property (strong,nonatomic) NSString* roomId; +@property (assign,nonatomic) BOOL isRequesting; +@end + +@implementation JFIdolProjectResultView + +- (void)awakeFromNib +{ + [super awakeFromNib]; + + [self.collectionView registerNib:[UINib nibWithNibName:@"JFIdolProjectResultCell" bundle:nil] forCellWithReuseIdentifier:@"JFIdolProjectResultCell"]; + self.collectionView.delegate = self; + self.collectionView.dataSource = self; +} + ++ (void)showWish:(NSArray *)models roomId:(NSString*)roomId againType:(NSInteger)againType buyBlock:(JFRoomWishAgain)buyBlock refreshWalletBlock:(JFRefreshWallet)refreshWalletBlock +{ + JFIdolProjectResultView *shareView = [[NSBundle mainBundle]loadNibNamed:@"JFIdolProjectResultView" owner:self options:nil][0]; + shareView.frame = CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + shareView.buyBlock = buyBlock; + shareView.refreshWalletBlock = refreshWalletBlock; + shareView.roomId = roomId; + [[UIApplication sharedApplication].keyWindow addSubview:shareView]; + [shareView addNotification]; + + shareView.againType = againType; + shareView.models = models; +} + +- (void)dealloc +{ + [[NSNotificationCenter defaultCenter] removeObserver:self]; +} + +- (void)addNotification +{ + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sureBtnAction:) name:@"CloseRoomDialogView" object:nil]; +} + +- (IBAction)sureBtnAction:(id)sender { + [self removeFromSuperview]; +} +-(void)drawGiftWithNum:(NSString*)num{ + + NSDictionary *parameters = @{ + @"gift_bag_id":@"61", + @"room_id":self.roomId, + @"num":num, + }; + self.isRequesting = YES; + MJWeakSelf + NSString *server = QXGlobal.shareGlobal.currentServer; + [[QXRequset shareInstance] postWithUrl:[NSString stringWithFormat:@"%@%@",server,@"api/BlindBoxTurntable/draw_gift"] parameters:parameters needCache:NO success:^(id responseObject) { + weakSelf.isRequesting = NO; + QXDrawGiftResultModel *model = [QXDrawGiftResultModel yy_modelWithJSON:responseObject[@"data"]]; + weakSelf.models = model.reslut_list; + if (weakSelf.refreshWalletBlock) { + weakSelf.refreshWalletBlock(); + } + } fail:^(NSError *error, NSString *msg, NSURLSessionDataTask *task) { + weakSelf.isRequesting = NO; + [weakSelf sureBtnAction:nil]; + if (weakSelf.buyBlock){ + weakSelf.buyBlock(self.againType); + }; + showToast(msg); + }]; +} + +//单次许愿 +- (IBAction)oneWishBtnAction:(UIButton *)sender { + + if (sender) { + sender.userInteractionEnabled = NO; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + sender.userInteractionEnabled = YES; + }); + } + +// [MBProgressHUD showLoading]; +// __weak typeof(self)weakSelf =self; +// [JFHttpRequestHelper wish:self.againType success:^(id data) { +// +// [MBProgressHUD hideHUD]; +// weakSelf.models = data; +// +// } failure:^(NSNumber *code, NSString *msg) { +// [MBProgressHUD showError:msg]; +// [weakSelf sureBtnAction:nil]; +// if (weakSelf.buyBlock) weakSelf.buyBlock(self.againType); +// }]; + [self drawGiftWithNum:@"1"]; +} + +- (IBAction)wishBtnAction10:(UIButton *)sender { + + if (sender) { + sender.userInteractionEnabled = NO; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + sender.userInteractionEnabled = YES; + }); + } + +// [MBProgressHUD showLoading]; +// __weak typeof(self)weakSelf =self; +// [JFHttpRequestHelper wish:self.againType success:^(id data) { +// +// [MBProgressHUD hideHUD]; +// weakSelf.models = data; +// +// } failure:^(NSNumber *code, NSString *msg) { +// [MBProgressHUD showError:msg]; +// [weakSelf sureBtnAction:nil]; +// if (weakSelf.buyBlock) weakSelf.buyBlock(self.againType); +// }]; + [self drawGiftWithNum:@"10"]; +} + +- (IBAction)wishBtnAction20:(UIButton *)sender { + + if (sender) { + sender.userInteractionEnabled = NO; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + sender.userInteractionEnabled = YES; + }); + } + + if (self.againType == 1) { + [self oneWishBtnAction:nil]; + return; + } + + if (self.againType == 10) { + [self wishBtnAction10:nil]; + return; + } + [self drawGiftWithNum:@"20"]; +// [MBProgressHUD showLoading]; +// __weak typeof(self)weakSelf =self; +// [JFHttpRequestHelper wish:self.againType success:^(id data) { +// +// [MBProgressHUD hideHUD]; +// weakSelf.models = data; +// +// } failure:^(NSNumber *code, NSString *msg) { +// [MBProgressHUD showError:msg]; +// [weakSelf sureBtnAction:nil]; +// if (weakSelf.buyBlock) weakSelf.buyBlock(self.againType); +// }]; + +} + +- (IBAction)oneSureAction:(id)sender { + [self removeFromSuperview]; +} + +#pragma mark - +- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { + + if (self.models.count == 1) { + return 0; + } + + return self.models.count; +} + +- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { + JFIdolProjectResultCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"JFIdolProjectResultCell" forIndexPath:indexPath]; + + QXDrawGiftModel *model = [self.models objectAtIndex:indexPath.item]; + cell.model = model; + + return cell; +} + +- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { + +} + +- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath { + return CGSizeMake(80, 118); +} + +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section{ + return 5; +} +- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section{ + return 0; +} +- (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout insetForSectionAtIndex:(NSInteger)section{ + return UIEdgeInsetsMake(0, 0, 0, 0); +} + +- (void)setModels:(NSArray *)models +{ + _models = models; + + if (models.count == 1) { + self.moreResultView.hidden = YES; + self.moreSureBtn.hidden = YES; + self.moreWishBtn20.hidden = YES; + self.oneBgView.hidden = NO; + + self.oneImageView.image = nil; + self.oneLabel.text = @""; + + QXDrawGiftModel *item = models.firstObject; + [self.oneImageView sd_setImageWithURL:[NSURL URLWithString:item.base_image]]; + self.oneLabel.text = [NSString stringWithFormat:@"%@*%@", item.gift_name, item.count]; + + [self startShakeAnimation]; + } else { + self.oneBgView.hidden = YES; + self.moreResultView.hidden = NO; + self.moreSureBtn.hidden = NO; + self.moreWishBtn20.hidden = NO; + [self.collectionView reloadData]; + + [self stopShakeAnimation]; + } +} + +- (void)setAgainType:(NSInteger)againType +{ + _againType = againType; + if (againType == 1) { + [self.moreWishBtn20 setImage:[UIImage imageNamed:@"room_prize_result_open1"] forState:UIControlStateNormal]; + } else if (againType == 10) { + [self.moreWishBtn20 setImage:[UIImage imageNamed:@"room_prize_result_open10"] forState:UIControlStateNormal]; + } else if (againType == 20) { + [self.moreWishBtn20 setImage:[UIImage imageNamed:@"room_prize_result_open20"] forState:UIControlStateNormal]; + } +} + +- (void)startShakeAnimation +{ + CABasicAnimation *a1 = [CABasicAnimation animationWithKeyPath:@"transform.scale"]; + [a1 setFromValue:[NSNumber numberWithFloat:1.0]]; + [a1 setToValue:[NSNumber numberWithFloat:1.3]]; + [a1 setBeginTime:0.0]; + [a1 setDuration:0.1]; + + CABasicAnimation *a2 = [CABasicAnimation animationWithKeyPath:@"transform.scale"]; + [a2 setFromValue:[NSNumber numberWithFloat:1.3]]; + [a2 setToValue:[NSNumber numberWithFloat:0.8]]; + [a2 setBeginTime:0.1]; + [a2 setDuration:0.15]; + + CABasicAnimation *a3 = [CABasicAnimation animationWithKeyPath:@"transform.scale"]; + [a3 setFromValue:[NSNumber numberWithFloat:0.8]]; + [a3 setToValue:[NSNumber numberWithFloat:1.0]]; + [a3 setBeginTime:0.25]; + [a3 setDuration:0.1]; + + CAAnimationGroup *group = [CAAnimationGroup animation]; + [group setDuration:0.35]; + [group setAnimations:[NSArray arrayWithObjects:a1, a2, a3, nil]]; + + [self.oneImageView.layer addAnimation:group forKey:nil]; +} + +- (void)stopShakeAnimation +{ + [self.oneImageView.layer removeAllAnimations]; +} + +@end diff --git a/QXLive/活动/爱豆计划/Result/JFIdolProjectResultView.xib b/QXLive/活动/爱豆计划/Result/JFIdolProjectResultView.xib new file mode 100755 index 0000000..0ce6734 --- /dev/null +++ b/QXLive/活动/爱豆计划/Result/JFIdolProjectResultView.xib @@ -0,0 +1,191 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/QXLive/活动/爱豆计划/Svga/prize_call_box_default.svga b/QXLive/活动/爱豆计划/Svga/prize_call_box_default.svga new file mode 100755 index 0000000..4d6b5e7 Binary files /dev/null and b/QXLive/活动/爱豆计划/Svga/prize_call_box_default.svga differ diff --git a/QXLive/活动/爱豆计划/Svga/prize_call_open_box.svga b/QXLive/活动/爱豆计划/Svga/prize_call_open_box.svga new file mode 100755 index 0000000..713da75 Binary files /dev/null and b/QXLive/活动/爱豆计划/Svga/prize_call_open_box.svga differ