diff --git a/Podfile b/Podfile index 5fda0de7..8949a883 100644 --- a/Podfile +++ b/Podfile @@ -4,9 +4,9 @@ source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git' target 'YuMi' do use_frameworks! #pag动画 - pod 'libpag', '~> 4.3.21' + pod 'libpag' pod 'Bugly' - pod 'Adjust', '~> 4.31.0' + pod 'Adjust' pod 'Firebase/Analytics' pod 'FBSDKLoginKit' pod 'FBSDKCoreKit' @@ -40,21 +40,20 @@ target 'YuMi' do pod 'IQKeyboardManager' pod 'TZImagePickerController' #TRTC - pod 'TXLiteAVSDK_TRTC', '~> 11.4.14530' + pod 'TXLiteAVSDK_TRTC' #vap礼物动画 pod 'QGVAPlayer' #上传音乐 pod 'CocoaAsyncSocket',:modular_headers => true #声网 - pod 'AgoraRtcEngine_iOS', '~> 4.2.2' - #持久化存储 + pod 'AgoraRtcEngine_iOS' pod 'SSKeychain' pod 'Base64' #pop动画 - pod 'pop', '~> 1.0.12' + pod 'pop' #云信 - pod 'NIMSDK_LITE', '~> 9.2.8' - pod 'GKCycleScrollView', '~> 1.2.0' + pod 'NIMSDK_LITE' + pod 'GKCycleScrollView' pod 'SVGAPlayer' pod 'GoogleSignIn' pod 'mob_linksdk_pro' diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 1b343785..9f0978ab 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -153,6 +153,7 @@ 232C43EA2AB15F4100D4B2ED /* XPRoomTarrowBannerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 232C43E92AB15F4100D4B2ED /* XPRoomTarrowBannerView.m */; }; 232C43EC2AB169EC00D4B2ED /* pi_room_tarrow_banner.svga in Resources */ = {isa = PBXBuildFile; fileRef = 232C43EB2AB169EB00D4B2ED /* pi_room_tarrow_banner.svga */; }; 232C444B2AB4363200D4B2ED /* pi_room_tarrow_h5_banner.svga in Resources */ = {isa = PBXBuildFile; fileRef = 232C444A2AB4363200D4B2ED /* pi_room_tarrow_h5_banner.svga */; }; + 232EBBFF2BD7A25500E8CEAD /* MSParamsDecode.m in Sources */ = {isa = PBXBuildFile; fileRef = 232EBBFE2BD7A25500E8CEAD /* MSParamsDecode.m */; }; 2331C0DC2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C0DB2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.m */; }; 2331C1632A5EB71000E1D940 /* XPNobleCenterPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1322A5EB71000E1D940 /* XPNobleCenterPresenter.m */; }; 2331C1642A5EB71000E1D940 /* NobleInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 2331C1362A5EB71000E1D940 /* NobleInfo.m */; }; @@ -261,6 +262,7 @@ 2377010E2BCF73F400D661F1 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2377010D2BCF73F400D661F1 /* CoreGraphics.framework */; }; 237701102BCF740400D661F1 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 2377010F2BCF740400D661F1 /* libsqlite3.tbd */; }; 237701122BCF742C00D661F1 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 237701112BCF742C00D661F1 /* libz.tbd */; }; + 237701192BD6143700D661F1 /* pi_happy_egg_smash.svga in Resources */ = {isa = PBXBuildFile; fileRef = 237701182BD6143700D661F1 /* pi_happy_egg_smash.svga */; }; 237B94BC2A984DA7007853E3 /* XPTrumpetPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */; }; 237B94BD2A984DA7007853E3 /* XPNobleTrumpetModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B32A984DA7007853E3 /* XPNobleTrumpetModel.m */; }; 237B94BE2A984DA7007853E3 /* XPRoomTrumpetViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 237B94B72A984DA7007853E3 /* XPRoomTrumpetViewController.m */; }; @@ -1801,6 +1803,8 @@ 232C43E92AB15F4100D4B2ED /* XPRoomTarrowBannerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPRoomTarrowBannerView.m; sourceTree = ""; }; 232C43EB2AB169EB00D4B2ED /* pi_room_tarrow_banner.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_tarrow_banner.svga; sourceTree = ""; }; 232C444A2AB4363200D4B2ED /* pi_room_tarrow_h5_banner.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_room_tarrow_h5_banner.svga; sourceTree = ""; }; + 232EBBFD2BD7A25500E8CEAD /* MSParamsDecode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSParamsDecode.h; sourceTree = ""; }; + 232EBBFE2BD7A25500E8CEAD /* MSParamsDecode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSParamsDecode.m; sourceTree = ""; }; 2331C0DA2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIFullScreenBannerAnimation.h; sourceTree = ""; }; 2331C0DB2A5E9E9000E1D940 /* PIFullScreenBannerAnimation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIFullScreenBannerAnimation.m; sourceTree = ""; }; 2331C1312A5EB71000E1D940 /* XPNobleCenterPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPNobleCenterPresenter.h; sourceTree = ""; }; @@ -2007,6 +2011,7 @@ 2377010D2BCF73F400D661F1 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 2377010F2BCF740400D661F1 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; }; 237701112BCF742C00D661F1 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; + 237701182BD6143700D661F1 /* pi_happy_egg_smash.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_happy_egg_smash.svga; sourceTree = ""; }; 237B94AD2A984DA7007853E3 /* XPTrumpetPresenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPTrumpetPresenter.h; sourceTree = ""; }; 237B94AE2A984DA7007853E3 /* XPTrumpetPresenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPTrumpetPresenter.m; sourceTree = ""; }; 237B94B02A984DA7007853E3 /* XPRoomTrumpetProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPRoomTrumpetProtocol.h; sourceTree = ""; }; @@ -4471,6 +4476,8 @@ children = ( 189DD6FD26E20E5900AB55B1 /* HttpRequestHelper.h */, 189DD6FE26E20E5900AB55B1 /* HttpRequestHelper.m */, + 232EBBFD2BD7A25500E8CEAD /* MSParamsDecode.h */, + 232EBBFE2BD7A25500E8CEAD /* MSParamsDecode.m */, ); path = Network; sourceTree = ""; @@ -9550,6 +9557,7 @@ isa = PBXGroup; children = ( 23EE96F12B9FF6BE00475D69 /* pi_crazy_zoo.svga */, + 237701182BD6143700D661F1 /* pi_happy_egg_smash.svga */, 23A03F2C2B4408CD0094227A /* pi_room_lucky_gift.svga */, 23FF256F2ABD456C0064E904 /* pi_home_new_play.svga */, 23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */, @@ -10655,7 +10663,7 @@ }; }; buildConfigurationList = 189DD52426DE255300AB55B1 /* Build configuration list for PBXProject "YuMi" */; - compatibilityVersion = "Xcode 9.3"; + compatibilityVersion = "Xcode 13.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -10749,6 +10757,7 @@ E80EC84828ACD84000D133C5 /* emoji_86@2x.png in Resources */, E80EC87728ACD84000D133C5 /* emoji_148@2x.png in Resources */, E80EC81928ACD84000D133C5 /* emoji_80@2x.png in Resources */, + 237701192BD6143700D661F1 /* pi_happy_egg_smash.svga in Resources */, E80EC8B328ACD84100D133C5 /* emoji_115@2x.png in Resources */, E80EC8A828ACD84100D133C5 /* emoji_76@2x.png in Resources */, 2368ECCF2BC38F9800EDF4C9 /* InfoPlist.strings in Resources */, @@ -11418,6 +11427,7 @@ E8AC722426F47E5E007D6E91 /* XPMineFeedbackViewController.m in Sources */, E8664ED627E434D5000171BA /* XPRoomPKRecordViewController.m in Sources */, E87E914E2796678D00A7B3F2 /* XPMineDressEmptyTableViewCell.m in Sources */, + 232EBBFF2BD7A25500E8CEAD /* MSParamsDecode.m in Sources */, 9B7D804D27537950003DAC0C /* MessageCell.m in Sources */, 23E9EAA62A84C97C00B792F2 /* XPMineUserInfoTagVC.m in Sources */, 9B044D9D282D2A6400DE4859 /* XPRoomAnchorRankEnterView.m in Sources */, @@ -12378,7 +12388,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.16; + MARKETING_VERSION = 20.20.17; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -12416,7 +12426,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 20.20.16; + MARKETING_VERSION = 20.20.17; PRODUCT_BUNDLE_IDENTIFIER = com.peko.enterprise.ios; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/YuMi/Appdelegate/AppDelegate.m b/YuMi/Appdelegate/AppDelegate.m index f66a35a1..9ee2b32c 100644 --- a/YuMi/Appdelegate/AppDelegate.m +++ b/YuMi/Appdelegate/AppDelegate.m @@ -58,7 +58,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; // 只有同意过了隐私协议 才初始化 if ([[NSUserDefaults standardUserDefaults] objectForKey:@"kYouMinumbernnagna"]) { ///初始化友盟 - [UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" channel:@"yumi_appstore"]; + [UMConfigure initWithAppkey:@"6434c6dfd64e686139618269" channel:@"appstore"]; } [[FBSDKApplicationDelegate sharedInstance] application:application didFinishLaunchingWithOptions:launchOptions]; [FIRApp configure]; diff --git a/YuMi/Assets.xcassets/Language/en/room_candy_tree_confirm_buy_title_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/YearActivity_goto_ar.imageset/Contents.json similarity index 81% rename from YuMi/Assets.xcassets/Language/en/room_candy_tree_confirm_buy_title_en.imageset/Contents.json rename to YuMi/Assets.xcassets/Language/ar/YearActivity_goto_ar.imageset/Contents.json index 68723325..5fee9882 100644 --- a/YuMi/Assets.xcassets/Language/en/room_candy_tree_confirm_buy_title_en.imageset/Contents.json +++ b/YuMi/Assets.xcassets/Language/ar/YearActivity_goto_ar.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "room_candy_tree_confirm_buy_title_en.png", + "filename" : "YearActivity_goto_ar.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/YuMi/Assets.xcassets/Language/ar/YearActivity_goto_ar.imageset/YearActivity_goto_ar.png b/YuMi/Assets.xcassets/Language/ar/YearActivity_goto_ar.imageset/YearActivity_goto_ar.png new file mode 100644 index 00000000..b4aeb256 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/YearActivity_goto_ar.imageset/YearActivity_goto_ar.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_title.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/anchor_hour_rank_icon_ar.imageset/Contents.json similarity index 68% rename from YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_title.imageset/Contents.json rename to YuMi/Assets.xcassets/Language/ar/anchor_hour_rank_icon_ar.imageset/Contents.json index a2eaaabe..dd3d974c 100644 --- a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_title.imageset/Contents.json +++ b/YuMi/Assets.xcassets/Language/ar/anchor_hour_rank_icon_ar.imageset/Contents.json @@ -1,16 +1,15 @@ { "images" : [ { + "filename" : "anchor_hour_rank_icon_ar.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "room_candy_tree_confirm_buy_title@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "room_candy_tree_confirm_buy_title@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/Language/ar/anchor_hour_rank_icon_ar.imageset/anchor_hour_rank_icon_ar.png b/YuMi/Assets.xcassets/Language/ar/anchor_hour_rank_icon_ar.imageset/anchor_hour_rank_icon_ar.png new file mode 100644 index 00000000..60f107ed Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/anchor_hour_rank_icon_ar.imageset/anchor_hour_rank_icon_ar.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/common_new_user_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/common_new_user_ar.imageset/Contents.json new file mode 100644 index 00000000..a8030c12 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/ar/common_new_user_ar.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "common_new_user_ar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/ar/common_new_user_ar.imageset/common_new_user_ar.png b/YuMi/Assets.xcassets/Language/ar/common_new_user_ar.imageset/common_new_user_ar.png new file mode 100644 index 00000000..6bd3b8a6 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/common_new_user_ar.imageset/common_new_user_ar.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/gift_tag_latest_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/gift_tag_latest_ar.imageset/Contents.json new file mode 100644 index 00000000..59b07b69 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/ar/gift_tag_latest_ar.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "gift_tag_latest_ar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/ar/gift_tag_latest_ar.imageset/gift_tag_latest_ar.png b/YuMi/Assets.xcassets/Language/ar/gift_tag_latest_ar.imageset/gift_tag_latest_ar.png new file mode 100644 index 00000000..b27fd6ae Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/gift_tag_latest_ar.imageset/gift_tag_latest_ar.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_naming_bg_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_naming_bg_ar.imageset/Contents.json new file mode 100644 index 00000000..0129576c --- /dev/null +++ b/YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_naming_bg_ar.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "gift_twelve_star_Banner_naming_bg_ar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_naming_bg_ar.imageset/gift_twelve_star_Banner_naming_bg_ar.png b/YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_naming_bg_ar.imageset/gift_twelve_star_Banner_naming_bg_ar.png new file mode 100644 index 00000000..50dca111 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_naming_bg_ar.imageset/gift_twelve_star_Banner_naming_bg_ar.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_rich_bg_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_rich_bg_ar.imageset/Contents.json new file mode 100644 index 00000000..50ff002b --- /dev/null +++ b/YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_rich_bg_ar.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "gift_twelve_star_Banner_rich_bg_ar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_rich_bg_ar.imageset/gift_twelve_star_Banner_rich_bg_ar.png b/YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_rich_bg_ar.imageset/gift_twelve_star_Banner_rich_bg_ar.png new file mode 100644 index 00000000..2e6ce055 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_rich_bg_ar.imageset/gift_twelve_star_Banner_rich_bg_ar.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/mine_info_recharge_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/mine_info_recharge_ar.imageset/Contents.json new file mode 100644 index 00000000..c5dea7f4 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/ar/mine_info_recharge_ar.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "mine_info_recharge_ar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/ar/mine_info_recharge_ar.imageset/mine_info_recharge_ar.png b/YuMi/Assets.xcassets/Language/ar/mine_info_recharge_ar.imageset/mine_info_recharge_ar.png new file mode 100644 index 00000000..de7f5cab Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/mine_info_recharge_ar.imageset/mine_info_recharge_ar.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/mine_noble_center_rank_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/mine_noble_center_rank_ar.imageset/Contents.json new file mode 100644 index 00000000..dd1d5df6 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/ar/mine_noble_center_rank_ar.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mine_noble_center_rank_ar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mine_noble_center_rank_ar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/ar/mine_noble_center_rank_ar.imageset/mine_noble_center_rank_ar@2x.png b/YuMi/Assets.xcassets/Language/ar/mine_noble_center_rank_ar.imageset/mine_noble_center_rank_ar@2x.png new file mode 100644 index 00000000..2c6cef87 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/mine_noble_center_rank_ar.imageset/mine_noble_center_rank_ar@2x.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/mine_noble_center_rank_ar.imageset/mine_noble_center_rank_ar@3x.png b/YuMi/Assets.xcassets/Language/ar/mine_noble_center_rank_ar.imageset/mine_noble_center_rank_ar@3x.png new file mode 100644 index 00000000..54358ee5 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/mine_noble_center_rank_ar.imageset/mine_noble_center_rank_ar@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/mine_noble_center_tag_title_bg_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/mine_noble_center_tag_title_bg_ar.imageset/Contents.json new file mode 100644 index 00000000..a8e5518c --- /dev/null +++ b/YuMi/Assets.xcassets/Language/ar/mine_noble_center_tag_title_bg_ar.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mine_noble_center_tag_title_bg_ar@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mine_noble_center_tag_title_bg_ar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/ar/mine_noble_center_tag_title_bg_ar.imageset/mine_noble_center_tag_title_bg_ar@2x.png b/YuMi/Assets.xcassets/Language/ar/mine_noble_center_tag_title_bg_ar.imageset/mine_noble_center_tag_title_bg_ar@2x.png new file mode 100644 index 00000000..1907de82 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/mine_noble_center_tag_title_bg_ar.imageset/mine_noble_center_tag_title_bg_ar@2x.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/mine_noble_center_tag_title_bg_ar.imageset/mine_noble_center_tag_title_bg_ar@3x.png b/YuMi/Assets.xcassets/Language/ar/mine_noble_center_tag_title_bg_ar.imageset/mine_noble_center_tag_title_bg_ar@3x.png new file mode 100644 index 00000000..8f9b0f28 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/mine_noble_center_tag_title_bg_ar.imageset/mine_noble_center_tag_title_bg_ar@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/noble_myLevel_head_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/noble_myLevel_head_ar.imageset/Contents.json new file mode 100644 index 00000000..bb01a58e --- /dev/null +++ b/YuMi/Assets.xcassets/Language/ar/noble_myLevel_head_ar.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "noble_myLevel_head_ar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/ar/noble_myLevel_head_ar.imageset/noble_myLevel_head_ar@3x.png b/YuMi/Assets.xcassets/Language/ar/noble_myLevel_head_ar.imageset/noble_myLevel_head_ar@3x.png new file mode 100644 index 00000000..3eb0600f Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/noble_myLevel_head_ar.imageset/noble_myLevel_head_ar@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/pi_webView_code_top_text_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/pi_webView_code_top_text_ar.imageset/Contents.json new file mode 100644 index 00000000..9bc3a520 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/ar/pi_webView_code_top_text_ar.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "pi_webView_code_top_text_ar.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/ar/pi_webView_code_top_text_ar.imageset/pi_webView_code_top_text_ar.png b/YuMi/Assets.xcassets/Language/ar/pi_webView_code_top_text_ar.imageset/pi_webView_code_top_text_ar.png new file mode 100644 index 00000000..32d9544e Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/pi_webView_code_top_text_ar.imageset/pi_webView_code_top_text_ar.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/room_gift_super_gift_icon_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/room_gift_super_gift_icon_ar.imageset/Contents.json new file mode 100644 index 00000000..82cdc38b --- /dev/null +++ b/YuMi/Assets.xcassets/Language/ar/room_gift_super_gift_icon_ar.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_gift_super_gift_icon_ar@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/ar/room_gift_super_gift_icon_ar.imageset/room_gift_super_gift_icon_ar@3x.png b/YuMi/Assets.xcassets/Language/ar/room_gift_super_gift_icon_ar.imageset/room_gift_super_gift_icon_ar@3x.png new file mode 100644 index 00000000..0a032e9f Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/room_gift_super_gift_icon_ar.imageset/room_gift_super_gift_icon_ar@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/room_little_game_normal_room_selec_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/room_little_game_normal_room_select_ar.imageset/Contents.json similarity index 100% rename from YuMi/Assets.xcassets/Language/ar/room_little_game_normal_room_selec_ar.imageset/Contents.json rename to YuMi/Assets.xcassets/Language/ar/room_little_game_normal_room_select_ar.imageset/Contents.json diff --git a/YuMi/Assets.xcassets/Language/ar/room_little_game_normal_room_selec_ar.imageset/room_little_game_normal_room_selec_ar.png b/YuMi/Assets.xcassets/Language/ar/room_little_game_normal_room_select_ar.imageset/room_little_game_normal_room_selec_ar.png similarity index 100% rename from YuMi/Assets.xcassets/Language/ar/room_little_game_normal_room_selec_ar.imageset/room_little_game_normal_room_selec_ar.png rename to YuMi/Assets.xcassets/Language/ar/room_little_game_normal_room_select_ar.imageset/room_little_game_normal_room_selec_ar.png diff --git a/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/Contents.json index a22478a6..f3308687 100644 --- a/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/Contents.json +++ b/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/Contents.json @@ -1,15 +1,16 @@ { "images" : [ { - "filename" : "mine_noble_center_rank_en.png", "idiom" : "universal", "scale" : "1x" }, { + "filename" : "mine_noble_center_rank_en@2x.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "mine_noble_center_rank_en@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/mine_noble_center_rank_en.png b/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/mine_noble_center_rank_en.png deleted file mode 100644 index 02aff24c..00000000 Binary files a/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/mine_noble_center_rank_en.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/mine_noble_center_rank_en@2x.png b/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/mine_noble_center_rank_en@2x.png new file mode 100644 index 00000000..934a6b4f Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/mine_noble_center_rank_en@2x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/mine_noble_center_rank_en@3x.png b/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/mine_noble_center_rank_en@3x.png new file mode 100644 index 00000000..577544eb Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/mine_noble_center_rank_en@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/Contents.json index 610416e3..1f10ba1c 100644 --- a/YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/Contents.json +++ b/YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/Contents.json @@ -1,15 +1,16 @@ { "images" : [ { - "filename" : "mine_noble_center_tag_title_bg_en.png", "idiom" : "universal", "scale" : "1x" }, { + "filename" : "mine_noble_center_tag_title_bg_en@2x.png", "idiom" : "universal", "scale" : "2x" }, { + "filename" : "mine_noble_center_tag_title_bg_en@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/mine_noble_center_tag_title_bg_en.png b/YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/mine_noble_center_tag_title_bg_en.png deleted file mode 100644 index c09e2d29..00000000 Binary files a/YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/mine_noble_center_tag_title_bg_en.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/mine_noble_center_tag_title_bg_en@2x.png b/YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/mine_noble_center_tag_title_bg_en@2x.png new file mode 100644 index 00000000..946ae0ff Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/mine_noble_center_tag_title_bg_en@2x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/mine_noble_center_tag_title_bg_en@3x.png b/YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/mine_noble_center_tag_title_bg_en@3x.png new file mode 100644 index 00000000..737c5cc1 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/mine_noble_center_tag_title_bg_en@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/pi_webView_code_top_text_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/pi_webView_code_top_text_en.imageset/Contents.json new file mode 100644 index 00000000..f5ac26bf --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/pi_webView_code_top_text_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "pi_webView_code_top_text_en.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/en/pi_webView_code_top_text_en.imageset/pi_webView_code_top_text_en.png b/YuMi/Assets.xcassets/Language/en/pi_webView_code_top_text_en.imageset/pi_webView_code_top_text_en.png new file mode 100644 index 00000000..432c7611 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/pi_webView_code_top_text_en.imageset/pi_webView_code_top_text_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_candy_tree_confirm_buy_title_en.imageset/room_candy_tree_confirm_buy_title_en.png b/YuMi/Assets.xcassets/Language/en/room_candy_tree_confirm_buy_title_en.imageset/room_candy_tree_confirm_buy_title_en.png deleted file mode 100644 index bab0df08..00000000 Binary files a/YuMi/Assets.xcassets/Language/en/room_candy_tree_confirm_buy_title_en.imageset/room_candy_tree_confirm_buy_title_en.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_rank.imageset/mine_noble_center_rank@2x.png b/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_rank.imageset/mine_noble_center_rank@2x.png index 413fee73..f647a48c 100644 Binary files a/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_rank.imageset/mine_noble_center_rank@2x.png and b/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_rank.imageset/mine_noble_center_rank@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_rank.imageset/mine_noble_center_rank@3x.png b/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_rank.imageset/mine_noble_center_rank@3x.png index 53947b6b..1fca5e36 100644 Binary files a/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_rank.imageset/mine_noble_center_rank@3x.png and b/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_rank.imageset/mine_noble_center_rank@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_tag_title_bg.imageset/mine_noble_center_tag_title_bg@2x.png b/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_tag_title_bg.imageset/mine_noble_center_tag_title_bg@2x.png index 6323b4d9..8d126ef9 100644 Binary files a/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_tag_title_bg.imageset/mine_noble_center_tag_title_bg@2x.png and b/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_tag_title_bg.imageset/mine_noble_center_tag_title_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_tag_title_bg.imageset/mine_noble_center_tag_title_bg@3x.png b/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_tag_title_bg.imageset/mine_noble_center_tag_title_bg@3x.png index ab893e93..0a3daea5 100644 Binary files a/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_tag_title_bg.imageset/mine_noble_center_tag_title_bg@3x.png and b/YuMi/Assets.xcassets/jm/Noble/mine_noble_center_tag_title_bg.imageset/mine_noble_center_tag_title_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/Contents.json b/YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/Contents.json index 7cb3c653..1bc5aac9 100644 --- a/YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/Contents.json +++ b/YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/Contents.json @@ -1,16 +1,15 @@ { "images" : [ { + "filename" : "pi_webView_code_top_text.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "pi_webView_code_top_text@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "pi_webView_code_top_text@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/pi_webView_code_top_text.png b/YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/pi_webView_code_top_text.png new file mode 100644 index 00000000..7841a860 Binary files /dev/null and b/YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/pi_webView_code_top_text.png differ diff --git a/YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/pi_webView_code_top_text@2x.png b/YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/pi_webView_code_top_text@2x.png deleted file mode 100644 index 2c1f3d9f..00000000 Binary files a/YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/pi_webView_code_top_text@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/pi_webView_code_top_text@3x.png b/YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/pi_webView_code_top_text@3x.png deleted file mode 100644 index b4323bd1..00000000 Binary files a/YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/pi_webView_code_top_text@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_bg.imageset/Contents.json b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_bg.imageset/Contents.json new file mode 100644 index 00000000..ef098667 --- /dev/null +++ b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_bg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_joyful_egg_smash_rank_bg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_joyful_egg_smash_rank_bg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_bg.imageset/ms_joyful_egg_smash_rank_bg@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_bg.imageset/ms_joyful_egg_smash_rank_bg@2x.png new file mode 100644 index 00000000..e636e9cf Binary files /dev/null and b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_bg.imageset/ms_joyful_egg_smash_rank_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_bg.imageset/ms_joyful_egg_smash_rank_bg@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_bg.imageset/ms_joyful_egg_smash_rank_bg@3x.png new file mode 100644 index 00000000..214c2a48 Binary files /dev/null and b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_bg.imageset/ms_joyful_egg_smash_rank_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_bg.imageset/Contents.json b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_bg.imageset/Contents.json new file mode 100644 index 00000000..90fe4751 --- /dev/null +++ b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_bg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_joyful_egg_smash_rank_btn_bg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_joyful_egg_smash_rank_btn_bg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_bg.imageset/ms_joyful_egg_smash_rank_btn_bg@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_bg.imageset/ms_joyful_egg_smash_rank_btn_bg@2x.png new file mode 100644 index 00000000..5b327f1c Binary files /dev/null and b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_bg.imageset/ms_joyful_egg_smash_rank_btn_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_bg.imageset/ms_joyful_egg_smash_rank_btn_bg@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_bg.imageset/ms_joyful_egg_smash_rank_btn_bg@3x.png new file mode 100644 index 00000000..dfd40234 Binary files /dev/null and b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_bg.imageset/ms_joyful_egg_smash_rank_btn_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_today.imageset/Contents.json b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_today.imageset/Contents.json new file mode 100644 index 00000000..2758c3da --- /dev/null +++ b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_today.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_joyful_egg_smash_rank_btn_today@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_joyful_egg_smash_rank_btn_today@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_today.imageset/ms_joyful_egg_smash_rank_btn_today@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_today.imageset/ms_joyful_egg_smash_rank_btn_today@2x.png new file mode 100644 index 00000000..25963995 Binary files /dev/null and b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_today.imageset/ms_joyful_egg_smash_rank_btn_today@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_today.imageset/ms_joyful_egg_smash_rank_btn_today@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_today.imageset/ms_joyful_egg_smash_rank_btn_today@3x.png new file mode 100644 index 00000000..f7fc78dc Binary files /dev/null and b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_today.imageset/ms_joyful_egg_smash_rank_btn_today@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_yesterday.imageset/Contents.json b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_yesterday.imageset/Contents.json new file mode 100644 index 00000000..04f332a4 --- /dev/null +++ b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_yesterday.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_joyful_egg_smash_rank_btn_yesterday@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_joyful_egg_smash_rank_btn_yesterday@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_yesterday.imageset/ms_joyful_egg_smash_rank_btn_yesterday@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_yesterday.imageset/ms_joyful_egg_smash_rank_btn_yesterday@2x.png new file mode 100644 index 00000000..4a227820 Binary files /dev/null and b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_yesterday.imageset/ms_joyful_egg_smash_rank_btn_yesterday@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_yesterday.imageset/ms_joyful_egg_smash_rank_btn_yesterday@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_yesterday.imageset/ms_joyful_egg_smash_rank_btn_yesterday@3x.png new file mode 100644 index 00000000..092d4801 Binary files /dev/null and b/YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_yesterday.imageset/ms_joyful_egg_smash_rank_btn_yesterday@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_bg.imageset/room_candy_tree_buy_bg@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_bg.imageset/room_candy_tree_buy_bg@2x.png index 0bf95cbd..4187a8d4 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_bg.imageset/room_candy_tree_buy_bg@2x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_bg.imageset/room_candy_tree_buy_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_bg.imageset/room_candy_tree_buy_bg@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_bg.imageset/room_candy_tree_buy_bg@3x.png index 6ca791b0..ced92a69 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_bg.imageset/room_candy_tree_buy_bg@3x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_bg.imageset/room_candy_tree_buy_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_icon.imageset/room_candy_tree_buy_icon@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_icon.imageset/room_candy_tree_buy_icon@2x.png index 1400ffff..85ac4e48 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_icon.imageset/room_candy_tree_buy_icon@2x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_icon.imageset/room_candy_tree_buy_icon@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_icon.imageset/room_candy_tree_buy_icon@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_icon.imageset/room_candy_tree_buy_icon@3x.png index f0ef9e3b..d4d8c92f 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_icon.imageset/room_candy_tree_buy_icon@3x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_icon.imageset/room_candy_tree_buy_icon@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/Contents.json b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/Contents.json index dcd98067..f11d8160 100644 --- a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/Contents.json +++ b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "room_candy_tree_buy_love__bg@2x.png", + "filename" : "room_candy_tree_buy_love_bg@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "room_candy_tree_buy_love__bg@3x.png", + "filename" : "room_candy_tree_buy_love_bg@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love__bg@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love__bg@2x.png deleted file mode 100644 index ca15b7e6..00000000 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love__bg@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love__bg@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love__bg@3x.png deleted file mode 100644 index 3615e745..00000000 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love__bg@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love_bg@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love_bg@2x.png new file mode 100644 index 00000000..5594c665 Binary files /dev/null and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love_bg@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love_bg@3x.png new file mode 100644 index 00000000..64e1bb0f Binary files /dev/null and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_but_btn.imageset/room_candy_tree_buy_love_but_btn@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_but_btn.imageset/room_candy_tree_buy_love_but_btn@2x.png index a2dd0d84..7b2ff18a 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_but_btn.imageset/room_candy_tree_buy_love_but_btn@2x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_but_btn.imageset/room_candy_tree_buy_love_but_btn@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_but_btn.imageset/room_candy_tree_buy_love_but_btn@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_but_btn.imageset/room_candy_tree_buy_love_but_btn@3x.png index dcee6f6c..9e6d2c91 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_but_btn.imageset/room_candy_tree_buy_love_but_btn@3x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_but_btn.imageset/room_candy_tree_buy_love_but_btn@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_close.imageset/room_candy_tree_buy_love_close@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_close.imageset/room_candy_tree_buy_love_close@2x.png index 9b9393d6..ef8ab20e 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_close.imageset/room_candy_tree_buy_love_close@2x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_close.imageset/room_candy_tree_buy_love_close@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_close.imageset/room_candy_tree_buy_love_close@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_close.imageset/room_candy_tree_buy_love_close@3x.png index 5ede5048..b3978bff 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_close.imageset/room_candy_tree_buy_love_close@3x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_close.imageset/room_candy_tree_buy_love_close@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon.imageset/room_candy_tree_buy_love_icon@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon.imageset/room_candy_tree_buy_love_icon@2x.png index 2f92404d..3d5f7ab9 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon.imageset/room_candy_tree_buy_love_icon@2x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon.imageset/room_candy_tree_buy_love_icon@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon.imageset/room_candy_tree_buy_love_icon@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon.imageset/room_candy_tree_buy_love_icon@3x.png index 5ff2cfe7..78934e9e 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon.imageset/room_candy_tree_buy_love_icon@3x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon.imageset/room_candy_tree_buy_love_icon@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon_bg.imageset/Contents.json b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon_bg.imageset/Contents.json new file mode 100644 index 00000000..dd002cfc --- /dev/null +++ b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon_bg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_candy_tree_buy_love_icon_bg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_candy_tree_buy_love_icon_bg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon_bg.imageset/room_candy_tree_buy_love_icon_bg@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon_bg.imageset/room_candy_tree_buy_love_icon_bg@2x.png new file mode 100644 index 00000000..101c591b Binary files /dev/null and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon_bg.imageset/room_candy_tree_buy_love_icon_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon_bg.imageset/room_candy_tree_buy_love_icon_bg@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon_bg.imageset/room_candy_tree_buy_love_icon_bg@3x.png new file mode 100644 index 00000000..965141db Binary files /dev/null and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon_bg.imageset/room_candy_tree_buy_love_icon_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_tap_bg.imageset/room_candy_tree_buy_tap_bg@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_tap_bg.imageset/room_candy_tree_buy_tap_bg@2x.png index 3c2e6e57..88c643e7 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_tap_bg.imageset/room_candy_tree_buy_tap_bg@2x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_tap_bg.imageset/room_candy_tree_buy_tap_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_tap_bg.imageset/room_candy_tree_buy_tap_bg@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_tap_bg.imageset/room_candy_tree_buy_tap_bg@3x.png index a2f59586..d7c912a2 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_tap_bg.imageset/room_candy_tree_buy_tap_bg@3x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_tap_bg.imageset/room_candy_tree_buy_tap_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_bg.imageset/room_candy_tree_confirm_buy_bg@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_bg.imageset/room_candy_tree_confirm_buy_bg@2x.png index 016abec7..1c1f17e8 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_bg.imageset/room_candy_tree_confirm_buy_bg@2x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_bg.imageset/room_candy_tree_confirm_buy_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_bg.imageset/room_candy_tree_confirm_buy_bg@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_bg.imageset/room_candy_tree_confirm_buy_bg@3x.png index 9b6fabe8..e31909d8 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_bg.imageset/room_candy_tree_confirm_buy_bg@3x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_bg.imageset/room_candy_tree_confirm_buy_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_title.imageset/room_candy_tree_confirm_buy_title@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_title.imageset/room_candy_tree_confirm_buy_title@2x.png deleted file mode 100644 index 0bb8065b..00000000 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_title.imageset/room_candy_tree_confirm_buy_title@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_title.imageset/room_candy_tree_confirm_buy_title@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_title.imageset/room_candy_tree_confirm_buy_title@3x.png deleted file mode 100644 index 4486adb3..00000000 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_title.imageset/room_candy_tree_confirm_buy_title@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_big_gift_bg.imageset/Contents.json b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_big_gift_bg.imageset/Contents.json new file mode 100644 index 00000000..930ae7c1 --- /dev/null +++ b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_big_gift_bg.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "room_candytree_large_big_gift_bg@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_candytree_large_big_gift_bg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_big_gift_bg.imageset/room_candytree_large_big_gift_bg@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_big_gift_bg.imageset/room_candytree_large_big_gift_bg@2x.png new file mode 100644 index 00000000..817e7a1e Binary files /dev/null and b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_big_gift_bg.imageset/room_candytree_large_big_gift_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_big_gift_bg.imageset/room_candytree_large_big_gift_bg@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_big_gift_bg.imageset/room_candytree_large_big_gift_bg@3x.png new file mode 100644 index 00000000..76d01d8f Binary files /dev/null and b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_big_gift_bg.imageset/room_candytree_large_big_gift_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_gift_bg.imageset/room_candytree_large_gift_bg@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_gift_bg.imageset/room_candytree_large_gift_bg@2x.png index 5541dbe1..484d3799 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_gift_bg.imageset/room_candytree_large_gift_bg@2x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_gift_bg.imageset/room_candytree_large_gift_bg@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_gift_bg.imageset/room_candytree_large_gift_bg@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_gift_bg.imageset/room_candytree_large_gift_bg@3x.png index 09942f7f..b8a3b3f4 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_gift_bg.imageset/room_candytree_large_gift_bg@3x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_gift_bg.imageset/room_candytree_large_gift_bg@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num1.imageset/room_candytree_wish_num1@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num1.imageset/room_candytree_wish_num1@2x.png index 063a13d5..980a9888 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num1.imageset/room_candytree_wish_num1@2x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num1.imageset/room_candytree_wish_num1@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num1.imageset/room_candytree_wish_num1@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num1.imageset/room_candytree_wish_num1@3x.png index 0f6b1653..9e576a97 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num1.imageset/room_candytree_wish_num1@3x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num1.imageset/room_candytree_wish_num1@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num2.imageset/room_candytree_wish_num2@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num2.imageset/room_candytree_wish_num2@2x.png index 3d6446e7..6701289c 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num2.imageset/room_candytree_wish_num2@2x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num2.imageset/room_candytree_wish_num2@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num2.imageset/room_candytree_wish_num2@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num2.imageset/room_candytree_wish_num2@3x.png index b44cb109..e0068f9c 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num2.imageset/room_candytree_wish_num2@3x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num2.imageset/room_candytree_wish_num2@3x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num3.imageset/room_candytree_wish_num3@2x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num3.imageset/room_candytree_wish_num3@2x.png index d3bc582a..ad6b90db 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num3.imageset/room_candytree_wish_num3@2x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num3.imageset/room_candytree_wish_num3@2x.png differ diff --git a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num3.imageset/room_candytree_wish_num3@3x.png b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num3.imageset/room_candytree_wish_num3@3x.png index 4833611c..e29d9a71 100644 Binary files a/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num3.imageset/room_candytree_wish_num3@3x.png and b/YuMi/Assets.xcassets/yna/CandyTree/room_candytree_wish_num3.imageset/room_candytree_wish_num3@3x.png differ diff --git a/YuMi/CustomUI/MSRTL/UILabel+MSRTL.m b/YuMi/CustomUI/MSRTL/UILabel+MSRTL.m index 70248448..f2a46f8b 100644 --- a/YuMi/CustomUI/MSRTL/UILabel+MSRTL.m +++ b/YuMi/CustomUI/MSRTL/UILabel+MSRTL.m @@ -7,6 +7,29 @@ #import "UILabel+MSRTL.h" #import "NSMutableAttributedString+MSRTL.h" + + + +BOOL isMSRTLString(NSString *string) { + if ([string hasPrefix:@"\u202B"] || [string hasPrefix:@"\u202A"]) { + return YES; + } + return NO; +} + +NSString * MSRTLString(NSString *string) { + if (string.length == 0 || isMSRTLString(string)) { + return string; + } + if (isMSRTL()) { + string = [@"\u202B" stringByAppendingString:string]; + } else { + string = [@"\u202A" stringByAppendingString:string]; + } + return string; +} + + @implementation UILabel (MSRTL) + (void)load { @@ -15,14 +38,19 @@ Method newInitMethod = class_getInstanceMethod(self, @selector(msrtl_initWithFrame:)); method_exchangeImplementations(oldInitMethod, newInitMethod); //交换成功 - Method oldTextMethod = class_getInstanceMethod(self,@selector(setTextAlignment:)); - Method newTextMethod = class_getInstanceMethod(self, @selector(msrtl_setTextAlignment:)); - method_exchangeImplementations(oldTextMethod, newTextMethod); //交换成功 + Method oldTextAlignmentMethod = class_getInstanceMethod(self,@selector(setTextAlignment:)); + Method newTextAlignmentMethod = class_getInstanceMethod(self, @selector(msrtl_setTextAlignment:)); + method_exchangeImplementations(oldTextAlignmentMethod, newTextAlignmentMethod); //交换成功 Method oldTextMethod1 = class_getInstanceMethod(self,@selector(setAttributedText:)); Method newTextMethod1 = class_getInstanceMethod(self, @selector(msrtl_setAttributedText:)); method_exchangeImplementations(oldTextMethod1, newTextMethod1); + + + + } + -(void)msrtl_setAttributedText:(NSAttributedString *)attributedText{ if(attributedText == nil)return; NSMutableAttributedString * attributedString = [[NSMutableAttributedString alloc]init]; diff --git a/YuMi/CustomUI/UIImageView/NetImageView.m b/YuMi/CustomUI/UIImageView/NetImageView.m index 48746315..e6942d72 100644 --- a/YuMi/CustomUI/UIImageView/NetImageView.m +++ b/YuMi/CustomUI/UIImageView/NetImageView.m @@ -46,6 +46,7 @@ - (void)initImageUrl:(NSString *)imageUrl { _imageUrl = imageUrl; _innerConfigedUrl = [UIImageConstant configUrl:_imageUrl type:self.config.imageType radius:self.config.radius]; + } - (void)setImageUrl:(NSString *)imageUrl { diff --git a/YuMi/Global/YUMIConstant.h b/YuMi/Global/YUMIConstant.h index 7bfd2234..a54893a9 100644 --- a/YuMi/Global/YUMIConstant.h +++ b/YuMi/Global/YUMIConstant.h @@ -20,7 +20,6 @@ UIKIT_EXTERN NSString * const kRoomQuickMessageCloseCount; UIKIT_EXTERN NSString * const kLoginMethod; typedef NS_ENUM(NSUInteger, Pi_KeyType) { KeyType_PasswordEncode,///密码 des 加密的 - KeyType_NTESQuickLoginBusinessId,///网易易盾 快捷登录 id KeyType_Agora,///声网 key KeyType_TRTC,///TRTC key KeyType_NetEase,///云信的key @@ -34,6 +33,8 @@ typedef NS_ENUM(NSUInteger, Pi_KeyType) { KeyType_SystemNotifiUidKey, ///小秘书 KeyType_SecretaryUidKey, + ///参数加密 + KeyType_Sign, }; /// 获取当前项目中所用到的 type 所对应的 value 的值 type 类型 diff --git a/YuMi/Global/YUMIConstant.m b/YuMi/Global/YUMIConstant.m index 6227c552..c4483bb9 100644 --- a/YuMi/Global/YUMIConstant.m +++ b/YuMi/Global/YUMIConstant.m @@ -64,7 +64,6 @@ NSString * const KeyWithType(Pi_KeyType type) { NSDictionary * dic = @{ @(KeyType_PasswordEncode) : @"1ea53d260ecf11e7b56e00163e046a26", - @(KeyType_NTESQuickLoginBusinessId) : @"09c1214706c34f4798d3f05d86148608", @(KeyType_Agora) : @"f8713b6ec98c4c01adaf34cb4fa091b1", @(KeyType_TRTC) : @"1400741885", @(KeyType_NetEase) : @"1c3b8c6bf8467d8e4c33a004dbec5c94", @@ -74,7 +73,8 @@ NSString * const KeyWithType(Pi_KeyType type) { @(KeyType_SudGameAppKey) : @"J9lHOXvFWkAZiTfl4SK7IGt0wDnW3fWd", @(KeyType_GuildUidKey) : @"938284", @(KeyType_SystemNotifiUidKey) : @"938283", - @(KeyType_SecretaryUidKey) : @"938282" + @(KeyType_SecretaryUidKey) : @"938282", + @(KeyType_Sign) : @"rpbs6us1m8r2j9g6u06ff2bo18orwaya" }; NSString * value = [dic objectForKey:@(type)]; return value; @@ -82,10 +82,15 @@ NSString * const KeyWithType(Pi_KeyType type) { NSDictionary *newDic = @{ - @(KeyType_Agora) : @"f8713b6ec98c4c01adaf34cb4fa091b1",///声网 + @(KeyType_Agora) : @"3da88e33bc4f45019cc867ec51d7b465",///声网 @(KeyType_SudGameAppID) : @"1578948593831571457",///小游戏 @(KeyType_SudGameAppKey) : @"J9lHOXvFWkAZiTfl4SK7IGt0wDnW3fWd",///小游戏 @(keyType_YiDunBussinessId) : @"f459972b432106844b89fd58c92b8061", + @(KeyType_TRTC) : @"1400823228",/// + @(KeyType_NetEase) : @"7371d729710cd6ce3a50163b956b5eb6",/// + @(KeyType_FacePwdEncode) : @"1ea53d260ecf11e7b56e00163e046a26",/// + @(KeyType_PasswordEncode) : @"1ea53d260ecf11e7b56e00163e046a26",/// + @(KeyType_Sign) : @"rpbs6us1m8r2j9g6u06ff2bo18orwaya" }; NSString * newValue = [newDic objectForKey:@(type)]; if(newValue != nil){ @@ -94,12 +99,8 @@ NSString * const KeyWithType(Pi_KeyType type) { NSDictionary * dic = @{ - @(KeyType_PasswordEncode) : @"mjaN83evhuwnbE4yEiLQpvH7sALhxCuJ6aPjPlq5amVpHsQtSdbgri3JoHqf/I9+",///1ea53d260ecf11e7b56e00163e046a26 - @(KeyType_NTESQuickLoginBusinessId) : @"sCsa0RnuPYtEeE+efSDuHRYEfCObccfLfAK/Sn1LC8X/YifkZfyHNlCts1syZE3R",///60cdaa83aa654e5ea184de7160b4073d - @(KeyType_TRTC) : @"Phn3JPi/ZvZ7zVM099Q3dg==",///1400600174 - ///h+GaKZVuHTQz0wEHbg8HLaUTL9mCjNDRcRo1OJTESWhiE/lzcnvMEv00/dxu8cOq - @(KeyType_NetEase) : @"d55LVCUFT72SVZskbk1L3ZCVjG+tRnUnOqAGuG04kb9uz+qIvbyudhJLDmbOFDtE",///d4d74e9ba6ac3364ccc7526ea4791215 - @(KeyType_FacePwdEncode) : @"mjaN83evhuwnbE4yEiLQpvH7sALhxCuJ6aPjPlq5amVpHsQtSdbgri3JoHqf/I9+",///1ea53d260ecf11e7b56e00163e046a26 + + @(KeyType_GuildUidKey) : @"umyLNHTFzWIPw2FWQcYIeQ==", @(KeyType_SystemNotifiUidKey) : @"ZacsLJGoW2hbNoXo32DnaA==", @(KeyType_SecretaryUidKey) : @"cHTJhjYL9UXGs8NJSFxhdg==" diff --git a/YuMi/Global/YUMIMacroUitls.h b/YuMi/Global/YUMIMacroUitls.h index 9152df44..6afd38ff 100644 --- a/YuMi/Global/YUMIMacroUitls.h +++ b/YuMi/Global/YUMIMacroUitls.h @@ -49,12 +49,13 @@ isPhoneXSeries = [[UIApplication sharedApplication] delegate].window.safeAreaIns ///内置版本号 -#define PI_App_Version @"2.6.6" +#define PI_App_Version @"1.0.3" ///渠道 #define PI_App_Source @"appstore" //#define PI_App_Source @"pi_tf" ///正式环境 #define API_HOST_URL @"https://api.hfighting.com" +//#define API_HOST_URL @"https://api.molistar.xyz" ///测试环境 #define API_HOST_TEST_URL @"http://beta.api.molistar.xyz" diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m index 1113b49c..6326b9e5 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m @@ -330,20 +330,20 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; // }else if([type intValue] == ThirdLoginType_Line){ // typeButton = self.lineButtonView; // } - if(typeButton == nil){ - return; - } - [self.view addSubview:self.nextView]; - [self.nextView addSubview:self.nextLabel]; - [self.nextView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(28)); - make.width.mas_equalTo(kGetScaleWidth(70)); - make.height.mas_equalTo(kGetScaleWidth(24)); - make.centerY.equalTo(typeButton.mas_top); - }]; - [self.nextLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.nextView); - }]; +// if(typeButton == nil){ +// return; +// } +// [self.view addSubview:self.nextView]; +// [self.nextView addSubview:self.nextLabel]; +// [self.nextView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.trailing.mas_equalTo(-kGetScaleWidth(28)); +// make.width.mas_equalTo(kGetScaleWidth(70)); +// make.height.mas_equalTo(kGetScaleWidth(24)); +// make.centerY.equalTo(typeButton.mas_top); +// }]; +// [self.nextLabel mas_makeConstraints:^(MASConstraintMaker *make) { +// make.edges.equalTo(self.nextView); +// }]; } } diff --git a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m index 0cbbc8df..1807e715 100644 --- a/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m +++ b/YuMi/Modules/YMMessage/View/Session/Content/MessageContentTextClickable.m @@ -93,15 +93,15 @@ CGFloat titleHeight = [textModel.attributedText.string boundingRectWithSize:CGSizeMake(240, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin attributes:[self messageTextAttibutes:[UIFont systemFontOfSize:16] color:[DJDKMIMOMColor mainTextColor]] context:nil].size.height; - if (titleHeight <= oneHeight * 2) { - [self.messageText mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(titleHeight + 5); - }]; - } else{ - [self.messageText mas_updateConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(oneHeight * 2); - }]; - } +// if (titleHeight <= oneHeight * 2) { +// [self.messageText mas_updateConstraints:^(MASConstraintMaker *make) { +// make.height.mas_equalTo(titleHeight + 5); +// }]; +// } else{ +// [self.messageText mas_updateConstraints:^(MASConstraintMaker *make) { +// make.height.mas_equalTo(oneHeight * 2); +// }]; +// } } - (NSDictionary *)messageTextAttibutes:(UIFont *)font color:(UIColor *)color { NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init]; diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.h b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.h index 11fef19b..c6614e3a 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.h +++ b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.h @@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN @property(nonatomic,strong) NSIndexPath *path; @property(nonatomic,strong) PINobleRebateModel *model; @property(nonatomic,copy) NSString *vipName; +@property(nonatomic,assign) NSInteger returnProfitsCount; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.m index 8c77a074..28dd0c48 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.m +++ b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListCell.m @@ -68,7 +68,7 @@ if (_path.section == 3 && _path.row > 0){ self.textVeiw.hidden = YES; } - CGFloat top = (_path.section == 0 && _path.row == 1) ? 12 : 0; + CGFloat top = (_path.section == 0 && _path.row == 1 && _returnProfitsCount >= 3) ? 12 : 0; [self.textVeiw mas_updateConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(top); @@ -146,7 +146,7 @@ make.leading.trailing.bottom.equalTo(self.contentView); }]; [self.getBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(32); + make.width.mas_equalTo(isMSEN() ? 40 : 32); make.height.mas_equalTo(13); make.center.equalTo(self); }]; diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.m index 0fd12694..527593d3 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.m +++ b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.m @@ -64,7 +64,10 @@ self.fooderView.hidden = _returnProfits.count == 0; _headerView.headerText = [NSString stringWithFormat:YMLocalizedString(@"PINobleCenterListView0"),_vipInfo.vipName]; self.pi_collectionView.layer.borderWidth = _returnProfits.count == 0 ? 0 : 1; - [self.pi_collectionView reloadData]; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [self.pi_collectionView reloadData]; + }); + } #pragma mark - UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout @@ -94,11 +97,14 @@ cell.path = indexPath; }else{ if (self.returnProfits.count > 0 && indexPath.section > 0){ + cell.returnProfitsCount = self.returnProfits.count; cell.count = self.returnProfits.count; cell.path = indexPath; cell.model = self.returnProfits[indexPath.row - 1]; }else{ + cell.returnProfitsCount = self.returnProfits.count; cell.path = indexPath; + cell.vipName = self.vipInfo.vipName; } } @@ -112,7 +118,8 @@ return CGSizeMake(kGetScaleWidth(347), kGetScaleWidth(300)); } if (indexPath.section == 0){ - return indexPath.row == 0 ? CGSizeMake(kGetScaleWidth(70), 24): CGSizeMake(kGetScaleWidth(70), 24*3); + NSInteger count = self.returnProfits.count > 2 ? 3 : self.returnProfits.count; + return indexPath.row == 0 ? CGSizeMake(kGetScaleWidth(70), 24): CGSizeMake(kGetScaleWidth(70), 24*count); }else if (indexPath.section == 1){ return indexPath.row == 0 ? CGSizeMake(kGetScaleWidth(78), 24) : CGSizeMake(kGetScaleWidth(78), 24); }else if (indexPath.section == 2){ @@ -123,7 +130,10 @@ } } - +- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ + PINobleCenterListCell *cell = [collectionView cellForItemAtIndexPath:indexPath]; + NSLog(@"%@",cell); +} #pragma mark - 懒加载 diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.m index 41028c5a..b57cf9f3 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.m +++ b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.m @@ -33,8 +33,14 @@ _bgImageView.hidden = !self.info.isReturnProfit; } -(void)installConstraints{ + CGFloat width = 43; + if (isMSEN()){ + width = 40; + }else if (isMSRTL()){ + width = 54; + } [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(41)); + make.width.mas_equalTo(kGetScaleWidth(width)); make.height.mas_equalTo(kGetScaleWidth(16)); make.top.mas_equalTo(0); make.trailing.mas_equalTo(10); @@ -46,7 +52,7 @@ - (UIImageView *)bgImageView{ if(!_bgImageView){ _bgImageView = [UIImageView new]; - _bgImageView.image = [UIImage getLanguageImage:@"mine_noble_center_tag_title_bg"]; + _bgImageView.image = [[UIImage getLanguageImage:@"mine_noble_center_tag_title_bg"] ms_SetImageForRTL]; _bgImageView.hidden = YES; } return _bgImageView; diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.m index a0b0a41a..5466d2eb 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.m +++ b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterEntranceView.m @@ -94,7 +94,11 @@ _vipInfo = vipInfo; if (vipInfo) { [self addSubview:self.nobleIconImage]; - self.nobleIconImage.imageUrl = vipInfo.vipIcon; + [self.nobleIconImage loadImageWithUrl:vipInfo.vipIcon completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { + self.nobleIconImage.image = image; + }fail:^(NSError * _Nonnull error) { + NSLog(@"%@",error); + }]; self.titleLabel.text = vipInfo.vipName; self.titleLabel.textColor = UIColorFromRGB(0x403077); self.bgImageView.image = [UIImage imageNamed:@"mine_noble_entrance_hadNoble"]; @@ -138,10 +142,10 @@ } } NSString *value = [NSString getDealNumwithstring:@(distanceValue).stringValue]; - self.descLabel.text = [NSString stringWithFormat:YMLocalizedString(@"XPNobleCenterEntranceView0"), value]; + self.descLabel.text = nobleInfo.currLevel >= 9 ? YMLocalizedString(@"XPNobleCenterEntranceView3") : [NSString stringWithFormat:YMLocalizedString(@"XPNobleCenterEntranceView0"), value]; self.descLabel.textColor = UIColorFromRGB(0x5E4D98); self.nextLevelLabel.text = nextLevelName; - self.descLabel.hidden = nobleInfo.currLevel >= 9; + CGFloat margin = self.backProgressView.frame.size.width * (nobleInfo.currScore * 1.0 / (nextScore > 0 ? nextScore : 1)); [self.currentProgressView mas_updateConstraints:^(MASConstraintMaker *make) { make.trailing.mas_equalTo(self.backProgressView.mas_leading).mas_offset(margin); diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeCell.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeCell.m index edd0a0a0..874d7aec 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeCell.m +++ b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeCell.m @@ -50,15 +50,14 @@ make.width.height.mas_equalTo(46); }]; [self.privilegeLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); + make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(3)); make.top.mas_equalTo(self.iconImageView.mas_bottom).mas_offset(7); - make.height.mas_equalTo(14); + }]; [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self); + make.leading.trailing.equalTo(self.contentView).inset(kGetScaleWidth(3)); make.top.mas_equalTo(self.privilegeLabel.mas_bottom).mas_offset(4); - make.height.mas_equalTo(14); - make.leading.mas_equalTo(4); + }]; } @@ -94,6 +93,7 @@ _privilegeLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightSemibold]; _privilegeLabel.textAlignment = NSTextAlignmentCenter; _privilegeLabel.textColor = [DJDKMIMOMColor hightNobleLightTextColor]; + _privilegeLabel.numberOfLines = 2; } return _privilegeLabel; } @@ -104,6 +104,7 @@ _descLabel.font = [UIFont systemFontOfSize:12 weight:UIFontWeightRegular]; _descLabel.textAlignment = NSTextAlignmentCenter; _descLabel.textColor = [DJDKMIMOMColor normalNobleTextColor]; + _descLabel.numberOfLines = 2; } return _descLabel; } diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeContentCell.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeContentCell.m index 579c2fd0..2405eb8b 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeContentCell.m +++ b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNoblePrivilegeContentCell.m @@ -132,7 +132,10 @@ - (void)setVipAuthInfos:(NSMutableArray *)vipAuthInfos { _vipAuthInfos = [NSMutableArray arrayWithArray:vipAuthInfos]; self.privilegeLabel.text = [NSString stringWithFormat:@"%zd/%zd", self.vipInfo.ownAuthTypes.count, self.vipAuthInfos.count]; - [self.collectionView reloadData]; + dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [self.collectionView reloadData]; + }); + } - (void)setVipInfo:(NobleInfo *)vipInfo { @@ -181,7 +184,7 @@ - (UICollectionView *)collectionView { if (!_collectionView) { MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.itemSize = CGSizeMake(KScreenWidth / 3, 105); + layout.itemSize = CGSizeMake(KScreenWidth / 3, 125); layout.minimumLineSpacing = 0; layout.minimumInteritemSpacing = 0; _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; diff --git a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.m b/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.m index f7af5f45..ca61d8b1 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.m +++ b/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterListViewController.m @@ -73,7 +73,7 @@ CGFloat lineCount = (itemCount % 3 == 0) ? itemCount / 3 : (itemCount / 3 + 1); CGFloat itemHeight = 105; CGFloat bottomHeight = kSafeAreaBottomHeight + 44 + 5; - return 90 + lineCount * itemHeight + bottomHeight + 59; + return 90 + lineCount * itemHeight + bottomHeight + 59 + 40; } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { diff --git a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m b/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m index e0c40a8d..ea351d39 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m +++ b/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m @@ -193,7 +193,7 @@ }]; [self.rankBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(57); + make.width.mas_equalTo(isMSZH() ? 57 : 78); make.height.mas_equalTo(24); make.trailing.mas_equalTo(-24); make.top.mas_equalTo(139); @@ -353,7 +353,13 @@ } } }else{ - self.rechargeModel = [self.rechargeList safeObjectAtIndex1:0]; + for (RechargeListModel *rechargeModel in self.rechargeList) { + if (rechargeModel.prodDesc.integerValue == 1){ + self.rechargeModel = rechargeModel; + break; + } + } + } if (self.rechargeModel != nil){ @@ -672,7 +678,7 @@ _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; _titleView.defaultSelectedIndex = 0; _titleView.listContainer = self.lineView; - _titleView.cellWidth = 60; + _titleView.cellWidth = isMSRTL() ? 70 : 60; _titleView.cellSpacing = 0; JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init]; diff --git a/YuMi/Modules/YMMine/View/PISwitchingEnvironmentVC.m b/YuMi/Modules/YMMine/View/PISwitchingEnvironmentVC.m index ad5caaec..d44a8f58 100644 --- a/YuMi/Modules/YMMine/View/PISwitchingEnvironmentVC.m +++ b/YuMi/Modules/YMMine/View/PISwitchingEnvironmentVC.m @@ -6,7 +6,7 @@ // #import "PISwitchingEnvironmentVC.h" -#import "XPLoginViewController.h" + #import "XPAdImageTool.h" #import "BaseNavigationController.h" diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m index 130c682b..d60f2289 100644 --- a/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m +++ b/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m @@ -242,7 +242,7 @@ if ([ClientConfig shareConfig].canOpen) { [self pushWebViewWIthUrl:URLWithType(kAccountlogoutURL)]; } else { - [self pushWebViewWIthUrl:@"youmi/modules/logOff/index.html"]; + [self pushWebViewWIthUrl:@"molistar/modules/logOff/index.html"]; } } break; diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m index 64fa9388..8948b20b 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m @@ -568,7 +568,7 @@ if (_userInfo) { self.nameLabel.text = _userInfo.nick; NSString *text = [NSString stringWithFormat:@"ID:%ld", (long)_userInfo.erbanNo]; - NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@ ",text] attributes:@{NSForegroundColorAttributeName:self.idLabel.textColor}]; + NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@ ",text] attributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x6D6B89)}]; NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; UIImage *iconImage = [UIImage imageNamed:@"user_card_copy_id1"];; attachment.bounds = CGRectMake(0, roundf(self.idLabel.font.capHeight - iconImage.size.height)/2.f, iconImage.size.width, iconImage.size.height); @@ -576,7 +576,7 @@ [textAtt insertAttributedString:[NSMutableAttributedString attributedStringWithAttachment:attachment] atIndex:textAtt.length]; self.idLabel.attributedText = textAtt; - + self.signLabel.text = _userInfo.userDesc.length > 0 ? _userInfo.userDesc : YMLocalizedString(@"XPTreasureFairyFriendCell0"); self.fansNumLabel.text =[NSString stringWithFormat:YMLocalizedString(@"XPMineUserInfoHeaderView2"), _userInfo.fansNum]; [self.sexImageView setTitle:[NSString getAgeWithBirth:_userInfo.birth] forState:UIControlStateNormal]; @@ -665,7 +665,7 @@ CGFloat height = image.size.height > 0 ? image.size.height : 1; CGFloat scale = image.size.width / height ; [self.nobleImageView mas_updateConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(20* scale, 20)); + make.size.mas_equalTo(CGSizeMake(30* scale, 30)); }]; }]; diff --git a/YuMi/Modules/YMMine/View/XPMineViewController.m b/YuMi/Modules/YMMine/View/XPMineViewController.m index 688d8a60..06be7e44 100644 --- a/YuMi/Modules/YMMine/View/XPMineViewController.m +++ b/YuMi/Modules/YMMine/View/XPMineViewController.m @@ -136,24 +136,7 @@ UIKIT_EXTERN NSString *kRequestRicket; } -(void)getDataInfo{ [self.presenter getUserInfo]; - [Api nobleCenterLevelList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { - if (code == 200){ - NobleCenterModel *model = [NobleCenterModel modelWithDictionary:data.data]; - NobleInfo *vipInfo ; - for (int index = 0; index < model.vipInfos.count; index++) { - NobleInfo *tagInfo = [model.vipInfos safeObjectAtIndex1:index]; - - if (model.currLevel > 0){ - if (tagInfo.vipLevel == model.currLevel) { - vipInfo = tagInfo; - break; - } - } - } - self.headView.vipInfo = vipInfo; - } - - }]; + } #pragma mark- 检查是否有转赠钻石权限 @@ -635,7 +618,25 @@ UIKIT_EXTERN NSString *kRequestRicket; ///获取VIP信息成功 - (void)getNobleCenterInfoSuccess:(NobleCenterModel *)model { self.headView.nobleInfo = model; - [self.tableView reloadData]; + [Api nobleCenterLevelList:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { + if (code == 200){ + NobleCenterModel *model = [NobleCenterModel modelWithDictionary:data.data]; + NobleInfo *vipInfo ; + for (int index = 0; index < model.vipInfos.count; index++) { + NobleInfo *tagInfo = [model.vipInfos safeObjectAtIndex1:index]; + + if (model.currLevel > 0){ + if (tagInfo.vipLevel == model.currLevel) { + vipInfo = tagInfo; + break; + } + } + } + self.headView.vipInfo = vipInfo; + } + [self.tableView reloadData]; + }]; + } -(void)getNobleCenterInfoFail{ diff --git a/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.h b/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.h index 41fd099d..6bac2886 100644 --- a/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.h +++ b/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.h @@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)homeChatPick; ///ip检测 -(void)checkIpRegionAction; - +- (void)getHomeTopData; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.m b/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.m index 2145adbb..25394060 100644 --- a/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.m +++ b/YuMi/Modules/YMNewHome/Presenter/XPHomeContainerPresenter.m @@ -6,6 +6,7 @@ // #import "XPHomeContainerPresenter.h" +#import #import "Api+Home.h" #import "AccountInfoStorage.h" #import "HomeTagModel.h" @@ -15,6 +16,48 @@ #import "PIHomeItemModel.h" #import "PIHomeCategoryTitleModel.h" @implementation XPHomeContainerPresenter +- (void)getHomeTopData{ + RACSubject* banner = [RACSubject subject]; + RACSubject* menu = [RACSubject subject]; + + [[RACSignal combineLatest:@[banner, menu] reduce:^id(NSArray* bannerList, NSArray* menuList){ + //在这里 进行请求后的方法，回到主线程 + dispatch_async(dispatch_get_main_queue(), ^{ + + //更新UI操作 + [[self getView] getHomeTopDataSuccess:bannerList menuList:menuList]; + }); + + return nil; + }] subscribeError:^(NSError * _Nullable error) { + dispatch_async(dispatch_get_main_queue(), ^{ + + //更新UI操作 + + }); + + }]; + + NSString * uid = [AccountInfoStorage instance].getUid; + [Api homeBannerList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + NSArray * array = [HomeBannerInfoModel modelsWithArray:data.data]; + [banner sendNext:array]; + [banner sendCompleted]; + }fail:^(NSInteger code, NSString * _Nullable msg) { + [menu sendError:nil]; + [menu sendCompleted]; + } errorToast:NO] uid:uid type:@"1"]; + + + [Api requestCurrentResourceListComplection:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + NSArray *list = [PIHomeItemModel modelsWithArray:data.data]; + [menu sendNext:list]; + [menu sendCompleted]; + }fail:^(NSInteger code, NSString * _Nullable msg) { + [menu sendError:nil]; + [menu sendCompleted]; + }]]; +} ///得到首页轮播图 - (void)getHomeTopBannerList{ NSString * uid = [AccountInfoStorage instance].getUid; diff --git a/YuMi/Modules/YMNewHome/Protocol/XPHomeContainerProtocol.h b/YuMi/Modules/YMNewHome/Protocol/XPHomeContainerProtocol.h index bf6ee35e..0da8d7ae 100644 --- a/YuMi/Modules/YMNewHome/Protocol/XPHomeContainerProtocol.h +++ b/YuMi/Modules/YMNewHome/Protocol/XPHomeContainerProtocol.h @@ -24,6 +24,7 @@ NS_ASSUME_NONNULL_BEGIN /// -(void)checkIpRegionFailWithMsg:(NSString *)msg; -(void)checkIpRegionSuccess:(NSInteger)seconds; +- (void)getHomeTopDataSuccess:(NSArray*)list menuList:(NSArray *)memuList; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m index 4690afa2..d6ea0724 100644 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m @@ -45,10 +45,10 @@ iconView.layer.borderWidth = 1; iconView.layer.borderColor = [UIColor whiteColor].CGColor; iconView.hidden = YES; - [self.avatarView addSubview:iconView]; - CGFloat left = kGetScaleWidth(90) + i * kGetScaleWidth(116); + [self.contentView addSubview:iconView]; + CGFloat left = kGetScaleWidth(90) + i * kGetScaleWidth(16); [iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(self.nameView.mas_top).mas_offset(-kGetScaleWidth(10)); + make.top.equalTo(self.subView.mas_bottom).mas_offset(kGetScaleWidth(8)); make.leading.mas_equalTo(left); make.width.height.mas_equalTo(kGetScaleWidth(20)); }]; @@ -66,6 +66,7 @@ [self.avatarView addSubview:self.pkImageView]; [self.contentView addSubview:self.nameView]; + [self.contentView addSubview:self.subView]; [self.contentView addSubview:self.heatGifView]; [self.contentView addSubview:self.heatView]; @@ -115,6 +116,12 @@ make.trailing.equalTo(self.tagavatarView.mas_leading).mas_equalTo(5); make.height.mas_equalTo(kGetScaleWidth(22)); + }]; + [self.subView mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.trailing.equalTo(self.nameView); + make.height.mas_equalTo(kGetScaleWidth(17)); + make.top.equalTo(self.nameView.mas_bottom).mas_offset(kGetScaleWidth(5)); + }]; [self.pkImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(23)); @@ -132,22 +139,33 @@ @kStrongify(self); self.avatarView.image = image; }]; - _tagavatarView.imageUrl = _roomInfo.tagPict; + [_tagavatarView loadImageWithUrl:_roomInfo.tagPict completion:^(UIImage * _Nullable image, NSURL * _Nonnull url) { + self.tagavatarView.image = image; + CGFloat width = kGetScaleWidth(62); + if (image.size.height > 0){ + width = image.size.width * kGetScaleWidth(19) / image.size.height; + } + [self.tagavatarView mas_updateConstraints:^(MASConstraintMaker *make) { + make.width.mas_equalTo(width); + }]; + + }]; + _subView.text = _roomInfo.introduction; _heatView.text = @(_roomInfo.onlineNum).stringValue; _rankImageView.image = nil; _pkImageView.hidden = !_roomInfo.crossPking; if(_roomInfo.isHourTop1 == YES){ - _rankImageView.image = [UIImage getLanguageImage:@"home_hour_no_1"]; + _rankImageView.image = [[UIImage getLanguageImage:@"home_hour_no_1"]ms_SetImageForRTL]; }else{ if(_roomInfo.isWeekTop1 == YES){ - _rankImageView.image = [UIImage getLanguageImage:@"home_week_no_1"]; ; + _rankImageView.image = [[UIImage getLanguageImage:@"home_week_no_1"] ms_SetImageForRTL]; } } for (int i = 0; i < 5; i++) { - NetImageView *iconView = [self.avatarView viewWithTag:100 + i]; + NetImageView *iconView = [self.contentView viewWithTag:100 + i]; if(i < _roomInfo.micUsers.count){ iconView.hidden = NO; HomePlayMicUserModel *playModel = _roomInfo.micUsers[i]; @@ -221,7 +239,7 @@ } - (UILabel *)subView{ if(!_subView){ - + _subView = [UILabel labelInitWithText:@"" font:kFontRegular(12) textColor:UIColorFromRGB(0x1E1E1F)]; } return _subView; } diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m index 5ad678ba..5cc51624 100644 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m +++ b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m @@ -89,7 +89,16 @@ - (void)setItemList:(NSArray *)itemList{ _itemList = itemList; self.collectionView.scrollEnabled = _itemList.count > 2; + self.collectionView.hidden = _itemList.count == 0; [self.collectionView reloadData]; + if (_itemList.count == 0){ + [self.collectionView mas_remakeConstraints:^(MASConstraintMaker *make) { + make.leading.mas_equalTo(0); + make.trailing.mas_equalTo(0); + make.top.mas_equalTo(kGetScaleWidth(0)); + make.height.mas_equalTo(kGetScaleWidth(0)); + }]; + } } @@ -125,6 +134,7 @@ _collectionView.dataSource = self; _collectionView.delegate = self; _collectionView.pagingEnabled = NO; + _collectionView.hidden = YES; _collectionView.scrollEnabled = NO; _collectionView.backgroundColor = [UIColor clearColor]; [_collectionView registerClass:[XPNewHomeItemCell class] forCellWithReuseIdentifier:NSStringFromClass([XPNewHomeItemCell class])]; diff --git a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m index af952485..ff6fe90d 100644 --- a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m +++ b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m @@ -281,8 +281,8 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; - (void)initHttp { - [self.presenter getHomeTopBannerList]; - [self.presenter getCurrentResourceList]; + [self.presenter getHomeTopData]; + [self requestCheckIp]; @@ -341,7 +341,14 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; } #pragma mark - JXCategoryViewDelegate - (NSUInteger)tableHeaderViewHeightInPagerView:(JXPagerView *)pagerView { - if(self.headView.bannerList.count == 0)return kGetScaleWidth(80); + + if (self.headView.itemList.count == 0 && self.headView.bannerList.count == 0){ + return 0; + }else if (self.headView.itemList.count > 0 && self.headView.bannerList.count == 0){ + return kGetScaleWidth(80); + }else if (self.headView.itemList.count == 0 && self.headView.bannerList.count > 0){ + return kGetScaleWidth(90); + } return kGetScaleWidth(170); } @@ -406,14 +413,13 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; return [gestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]] && [otherGestureRecognizer isKindOfClass:[UIPanGestureRecognizer class]]; } #pragma mark - XPHomeContainerProtocol --(void)getHomeTopBannerListSuccess:(NSArray *)list{ +- (void)getHomeTopDataSuccess:(NSArray*)list menuList:(NSArray *)memuList{ + self.headView.itemList = memuList; self.headView.bannerList = list; [self.pagingView reloadData]; [self.pagingView resizeTableHeaderViewHeightWithAnimatable:NO duration:0 curve:0]; } -- (void)getCurrentResourceListSuccess:(NSArray *)list{ - self.headView.itemList = list; -} + ///获取所有的tag成功 - (void)getHomeTagListSuccess:(NSArray *)array{ if(array.count == 0)return; diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m b/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m index 47d2b891..cd3558b2 100644 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m +++ b/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m @@ -503,7 +503,7 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView; [UIView animateWithDuration:0.1 animations:^{ candyTreeVC.view.frame = CGRectMake(0, 0, KScreenWidth, KScreenHeight); }completion:^(BOOL finished) { - candyTreeVC.view.backgroundColor = [UIColor colorWithWhite:0 alpha:0.5]; + }]; } diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m index c0fdff40..c9356838 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/SubViews/XPAnchorPkPanelView.m @@ -340,8 +340,11 @@ dispatch_source_set_event_handler(self.timer, ^{ @kStrongify(self); if(tempTime <= 0){ //倒计时结束，关闭 - dispatch_source_cancel(self.timer); - self.timer = nil; + if (self.timer != nil){ + dispatch_source_cancel(self.timer); + self.timer = nil; + } + ; dispatch_async(dispatch_get_main_queue(), ^{ if (self.pkPanelInfo.pkState == AcrossRoomPkStateTypePking) { self.timeLabel.text = YMLocalizedString(@"XPAnchorPkPanelView1"); diff --git a/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m b/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m index 4ba8310e..75713b03 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m @@ -48,8 +48,8 @@ make.edges.equalTo(self); }]; [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.bottom.equalTo(self); - make.leading.trailing.equalTo(self).inset(kGetScaleWidth(70)); + make.top.centerX.bottom.equalTo(self); + make.width.height.mas_equalTo(kGetScaleWidth(255)); }]; [self.clickBtn mas_makeConstraints:^(MASConstraintMaker *make) { @@ -65,8 +65,10 @@ NSString *title = textDic[key] == nil ? textDic[textDic.allKeys.firstObject] : textDic[key]; if(title.length == 0)return; [title stringByReplacingOccurrencesOfString:@"\n" withString:@""]; - - CGFloat font = _isSvga == YES ? _model.fontSize / 2 : _model.fontSize; + if (_model.fontSize <= 0){ + _model.fontSize = 12; + } + CGFloat font = _model.fontSize; NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:font],NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:_model.textColor]}]; for (PIUniversalBannerItemModel *model in _model.contents) { @@ -92,12 +94,7 @@ self.titleView.attributedText = attribute; self.svgaView.clearsAfterStop = NO; self.svgaView.videoItem = _model.videoItem; -// [self.svgaView setAttributedText:attribute forKey:_model.svgaTextKey]; [self.svgaView startAnimation]; - [self.titleView mas_updateConstraints:^(MASConstraintMaker *make) { - make.top.mas_equalTo(kGetScaleWidth(self.model.resourceTop)); - make.leading.trailing.equalTo(self).inset(kGetScaleWidth(70)); - }]; }else{ self.bgImageView.hidden = NO; self.bgImageView.image = _model.image; @@ -125,7 +122,7 @@ if (!_titleView){ _titleView = [UILabel new]; _titleView.textAlignment = NSTextAlignmentCenter; - _titleView.numberOfLines = 2; + _titleView.numberOfLines = 0; } return _titleView; } diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m index 0cbaad88..aae9241b 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnimationView.m @@ -239,6 +239,10 @@ if (broadcastMessage.content) { NSDictionary *msgDictionary = [broadcastMessage.content toJSONObject]; AttachmentModel *attachment = [AttachmentModel modelWithJSON:msgDictionary[@"body"]]; + NSString *partitionId = [NSString stringWithFormat:@"%@",attachment.data[@"partitionId"]]; + if(![partitionId isEqualToString:self.delegate.getUserInfo.partitionId]){ + return; + } if (attachment.first == CustomMessageType_Gift && attachment.second == Custom_Message_Sub_Gift_ChannelNotify){///广播 全服礼物飘屏 [self receiveBroadcastGift:attachment]; } else if (attachment.first == CustomMessageType_Noble_VIP && attachment.second == Custom_Message_Sub_Room_Noble_LevelUp_Suspend) {///VIP升级全服飘屏 @@ -415,7 +419,11 @@ SVGAParser *parser = [SVGAParser new]; [parser parseWithURL:[NSURL URLWithString:model.resourceContent] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { model.videoItem = videoItem; - bannerView = [[PIUniversalBannerView alloc]initWithFrame:CGRectMake(KScreenWidth, top, kGetScaleWidth(model.resourceWidth), kGetScaleWidth(model.resourceHeight)) ]; + CGFloat height = kGetScaleWidth(60); + if(videoItem.videoSize.width > 0){ + height = KScreenWidth * videoItem.videoSize.height / videoItem.videoSize.width; + } + bannerView = [[PIUniversalBannerView alloc]initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth, height)]; [self showGeneralFloatingScreenView:bannerView model:model]; } failureBlock:^(NSError * _Nonnull error) { [bannerView removeFromSuperview]; @@ -464,7 +472,7 @@ POPBasicAnimation *moveAnimation = [POPBasicAnimation animationWithPropertyNamed:kPOPViewCenter]; moveAnimation.fromValue = [NSValue valueWithCGPoint:CGPointMake(0, bannerView.center.y)]; moveAnimation.toValue = [NSValue valueWithCGPoint:CGPointMake(-KScreenWidth/2, bannerView.center.y)]; - moveAnimation.beginTime = CACurrentMediaTime() + 3; + moveAnimation.beginTime = CACurrentMediaTime() + 5; moveAnimation.duration = 0.5; moveAnimation.repeatCount = 1; moveAnimation.removedOnCompletion = YES; diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomCandyGiftView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomCandyGiftView.m index 8640a503..f0b894f3 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomCandyGiftView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomCandyGiftView.m @@ -89,24 +89,27 @@ self.titleLabel.attributedText = attribute; self.titleLabel.textAlignment = NSTextAlignmentCenter; if (self.isMaxLargeGift) { - self.backImageView.hidden = YES; - self.candyTreeView.hidden = NO; - @kWeakify(self); - - [self.parser parseWithNamed:@"pi_room_game_fine_love" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.candyTreeView.loops = 2; - self.candyTreeView.clearsAfterStop = NO; - self.candyTreeView.videoItem = videoItem; - [self.candyTreeView startAnimation]; - - } failureBlock:^(NSError * _Nonnull error) { - - }]; - +// self.backImageView.hidden = YES; +// self.candyTreeView.hidden = NO; +// @kWeakify(self); +// +// [self.parser parseWithNamed:@"pi_room_game_fine_love" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { +// @kStrongify(self); +// self.candyTreeView.loops = 2; +// self.candyTreeView.clearsAfterStop = NO; +// self.candyTreeView.videoItem = videoItem; +// [self.candyTreeView startAnimation]; +// +// } failureBlock:^(NSError * _Nonnull error) { +// +// }]; + self.backImageView.image = [kImage(@"room_candytree_large_big_gift_bg") ms_SetImageForRTL]; + self.backImageView.hidden = NO; + self.candyTreeView.hidden = YES; } else { self.backImageView.hidden = NO; self.candyTreeView.hidden = YES; + self.backImageView.image = [kImage(@"room_candytree_large_gift_bg") ms_SetImageForRTL]; } } diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomLuckyBigPrizeView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomLuckyBigPrizeView.m index a234656d..bccb24d0 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomLuckyBigPrizeView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomLuckyBigPrizeView.m @@ -93,6 +93,9 @@ NSString *luckyBagName = _giftInfo.luckyBagName ?: @""; NSString *giftNum = _giftInfo.giftNum ?: @"0"; NSString *mainText = [NSString stringWithFormat:YMLocalizedString(@"XPRoomLuckyBigPrizeView0"),nick,luckyBagName,goldPrice,giftName]; + if (isMSRTL()){ + mainText = [NSString stringWithFormat:YMLocalizedString(@"XPRoomLuckyBigPrizeView0"),nick,giftName,goldPrice,luckyBagName]; + } if([giftNum integerValue] > 1){ mainText = [NSString stringWithFormat:@"%@ X%@",mainText,giftNum]; } diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeRankTableViewCell.m b/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeRankTableViewCell.m index 2fde2528..e9afdccb 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeRankTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/Cell/XPCandyTreeRankTableViewCell.m @@ -16,8 +16,7 @@ @interface XPCandyTreeRankTableViewCell () ///排行榜图片 @property (nonatomic, strong) UIImageView *rankImageView; -///排行榜 -@property (nonatomic, strong) UILabel *rankLabel; + ///头像 @property (nonatomic, strong) NetImageView *avatarImageView; ///性别 @@ -46,7 +45,7 @@ self.backgroundColor = [UIColor clearColor]; self.selectionStyle = UITableViewCellSelectionStyleNone; [self.contentView addSubview:self.rankImageView]; - [self.contentView addSubview:self.rankLabel]; + [self.contentView addSubview:self.avatarImageView]; [self.contentView addSubview:self.nickNameLabel]; [self.contentView addSubview:self.coinNumberLabel]; @@ -54,24 +53,22 @@ } - (void)initSubViewConstraints { - [self.rankLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(23)); - make.centerY.mas_equalTo(self); - }]; + [self.rankImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.center.mas_equalTo(self.rankLabel); + make.leading.mas_equalTo(kGetScaleWidth(12)); make.width.height.mas_equalTo(kGetScaleWidth(22)); + make.centerY.mas_equalTo(self.contentView); }]; [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.contentView); - make.width.height.mas_equalTo(kGetScaleWidth(50)); - make.leading.mas_equalTo(self.rankImageView.mas_trailing).offset(kGetScaleWidth(12)); + make.width.height.mas_equalTo(kGetScaleWidth(58)); + make.leading.mas_equalTo(self.rankImageView.mas_trailing).offset(kGetScaleWidth(20)); }]; [self.nickNameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(kGetScaleWidth(15)); + make.leading.mas_equalTo(self.avatarImageView.mas_trailing).offset(kGetScaleWidth(8)); make.centerY.mas_equalTo(self.avatarImageView); make.trailing.mas_lessThanOrEqualTo(self.coinNumberLabel.mas_leading).offset(-kGetScaleWidth(5)); }]; @@ -99,11 +96,11 @@ if (roomRankModel.ranking.intValue <= 3) { self.rankImageView.image = [UIImage imageNamed:rankImage]; self.rankImageView.hidden = NO; - self.rankLabel.hidden = YES; + }else { - self.rankLabel.text = _roomRankModel.ranking; + self.rankImageView.hidden = YES; - self.rankLabel.hidden = NO; + } self.coinNumberLabel.text = roomRankModel.diamonds; self.avatarImageView.imageUrl = _roomRankModel.avatar; @@ -118,15 +115,7 @@ } -- (UILabel *)rankLabel { - if (!_rankLabel) { - _rankLabel = [[UILabel alloc] init]; - _rankLabel.font = kFontBold(18); - _rankLabel.textAlignment = NSTextAlignmentCenter; - _rankLabel.textColor = [UIColor whiteColor]; - } - return _rankLabel; -} + - (NetImageView *)avatarImageView { if (!_avatarImageView) { @@ -135,7 +124,7 @@ config.imageType = ImageTypeUserIcon; _avatarImageView = [[NetImageView alloc] initWithConfig:config]; _avatarImageView.layer.masksToBounds = YES; - _avatarImageView.layer.cornerRadius = kGetScaleWidth(50)/2; + _avatarImageView.layer.cornerRadius = kGetScaleWidth(58)/2; _avatarImageView.layer.borderWidth = 1; _avatarImageView.layer.borderColor = [UIColor whiteColor].CGColor; } diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyRankContainerView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyRankContainerView.m index c724f8a1..7bcccaa8 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyRankContainerView.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyRankContainerView.m @@ -6,27 +6,24 @@ // #import "XPCandyRankContainerView.h" -///Third -#import -#import -#import + + ///Tool #import "ThemeColor+Room.h" ///View #import "XPCandyTreeRankView.h" -@interface XPCandyRankContainerView () -///分页标题 -@property (nonatomic, strong) NSArray *titles; -///分页控件 -@property (nonatomic, strong) JXCategoryTitleView *titleView; -///分页lineView -@property (nonatomic, strong) JXCategoryListContainerView *contentView; +@interface XPCandyRankContainerView () +@property(nonatomic,strong) UIImageView *bgImageView; ///刷新 @property (nonatomic,strong) UIButton *refreshButton; ///今日榜单 @property (nonatomic,strong) XPCandyTreeRankView *todayListView; ///昨日榜单 @property (nonatomic,strong) XPCandyTreeRankView *yesterdayListView; +@property(nonatomic,strong) UIButton *todayBtn; +@property(nonatomic,strong) UIButton *yesterdayBtn; +@property(nonatomic,strong) UIImageView *btnBgView; + @end @implementation XPCandyRankContainerView @@ -43,14 +40,17 @@ #pragma mark - Private Method - (void)initSubViews { - UIImage *image = [UIImage gradientColorImageFromColors:@[UIColorFromRGB(0x83BBFF),UIColorFromRGB(0x927DFF)] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(KScreenWidth, kGetScaleWidth(390))]; - self.backgroundColor = [UIColor colorWithPatternImage:image]; - [self addSubview:self.titleView]; - [self addSubview:self.self.refreshButton]; - [self addSubview:self.contentView]; + + [self addSubview:self.bgImageView]; + [self addSubview:self.btnBgView]; + [self.btnBgView addSubview:self.todayBtn]; + [self.btnBgView addSubview:self.yesterdayBtn]; + [self addSubview:self.todayListView]; + [self addSubview:self.yesterdayListView]; + CAShapeLayer * layer = [CAShapeLayer layer]; - UIBezierPath * path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth,kGetScaleWidth(390)) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(kGetScaleWidth(20), kGetScaleWidth(20))]; + UIBezierPath * path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, KScreenWidth,kGetScaleWidth(552)) byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(kGetScaleWidth(20), kGetScaleWidth(20))]; layer.path = path.CGPath; self.layer.mask = layer; } @@ -58,36 +58,36 @@ - (void)initSubViewConstraints { [self mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(kGetScaleWidth(390)); + make.height.mas_equalTo(kGetScaleWidth(552)); }]; - - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.mas_equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(45)); - }]; - - [self.contentView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.bottom.mas_equalTo(self); - make.top.mas_equalTo(self.titleView.mas_bottom); - }]; - - [self.refreshButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(23)); - make.centerY.mas_equalTo(self.titleView.mas_centerY); - make.width.height.mas_equalTo(kGetScaleWidth(15)); - }]; -} - -#pragma mark - JXCategoryViewDelegate -- (NSInteger)numberOfListsInlistContainerView:(JXCategoryListContainerView *)listContainerView { - return self.titles.count; -} - -- (id)listContainerView:(JXCategoryListContainerView *)listContainerView initListForIndex:(NSInteger)index { - if (index == 0) { - return self.todayListView; - } - return self.yesterdayListView; + [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self); + }]; + [self.btnBgView mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.mas_equalTo(kGetScaleWidth(225)); + make.height.mas_equalTo(kGetScaleWidth(40)); + make.top.mas_equalTo(kGetScaleWidth(22)); + make.centerX.equalTo(self); + }]; + [self.todayBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.mas_equalTo(kGetScaleWidth(113)); + make.height.mas_equalTo(kGetScaleWidth(40)); + make.leading.top.mas_equalTo(0); + + + }]; + [self.yesterdayBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.mas_equalTo(kGetScaleWidth(113)); + make.height.mas_equalTo(kGetScaleWidth(40)); + make.trailing.top.mas_equalTo(0); + }]; + [self.todayListView mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.trailing.bottom.equalTo(self); + make.top.equalTo(self.btnBgView.mas_bottom).mas_offset(kGetScaleWidth(26)); + }]; + [self.yesterdayListView mas_makeConstraints:^(MASConstraintMaker *make) { + make.edges.equalTo(self.todayListView); + }]; } #pragma mark - Event Response @@ -95,44 +95,23 @@ self.todayListView.type = CandyTreeRecordType_Today; self.yesterdayListView.type = CandyTreeRecordType_Yesterday; } - +-(void)clickTodayBtnAction:(UIButton *)sender{ + if(sender == self.todayBtn){ + self.todayBtn.selected = YES; + self.yesterdayBtn.selected = NO; + self.todayListView.hidden = NO; + self.yesterdayListView.hidden = YES; + return; + } + self.todayBtn.selected = NO; + self.yesterdayBtn.selected = YES; + self.todayListView.hidden = YES; + self.yesterdayListView.hidden = NO; +} #pragma mark - Getters And Setters -- (JXCategoryTitleView *)titleView { - if (!_titleView) { - _titleView = [[JXCategoryTitleView alloc] init]; - _titleView.delegate = self; - _titleView.titles = self.titles; - _titleView.titleColor = [UIColor colorWithWhite:1 alpha:0.5]; - _titleView.titleSelectedColor = [UIColor whiteColor]; - _titleView.titleFont = kFontSemibold(16); - _titleView.titleSelectedFont = kFontSemibold(16); - _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; - _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; - _titleView.defaultSelectedIndex = 0; - _titleView.listContainer = self.contentView; - - JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init]; - lineView.indicatorColor = [UIColor whiteColor]; - lineView.indicatorWidth = kGetScaleWidth(13); - lineView.indicatorHeight = kGetScaleWidth(4); - lineView.verticalMargin = kGetScaleWidth(5); - lineView.indicatorCornerRadius = kGetScaleWidth(2); - _titleView.indicators = @[lineView]; - } - return _titleView; -} -- (JXCategoryListContainerView *)contentView { - if (!_contentView) { - _contentView = [[JXCategoryListContainerView alloc] initWithType:JXCategoryListContainerType_ScrollView delegate:self]; - _contentView.defaultSelectedIndex = 0; - } - return _contentView; -} -- (NSArray *)titles { - return @[YMLocalizedString(@"XPCandyRankContainerView0"), YMLocalizedString(@"XPCandyRankContainerView1")]; -} + - (UIButton *)refreshButton { if (!_refreshButton) { @@ -171,8 +150,52 @@ [self.delegate didClickHeadHandle:uid]; } }; + _yesterdayListView.hidden = YES; } return _yesterdayListView; } - +- (UIImageView *)bgImageView{ + if(!_bgImageView){ + _bgImageView = [UIImageView new]; + _bgImageView.image = [kImage(@"ms_joyful_egg_smash_rank_bg") ms_SetImageForRTL]; + _bgImageView.layer.cornerRadius = kGetScaleWidth(40)/2; + _bgImageView.layer.masksToBounds = YES; + } + return _bgImageView; +} +- (UIImageView *)btnBgView{ + if(!_btnBgView){ + _btnBgView = [UIImageView new]; + _btnBgView.userInteractionEnabled = YES; + _btnBgView.image = kImage(@"ms_joyful_egg_smash_rank_btn_bg"); + } + return _btnBgView; +} +- (UIButton *)todayBtn{ + if(!_todayBtn){ + _todayBtn = [UIButton new]; + [_todayBtn setBackgroundImage:nil forState:UIControlStateNormal]; + [_todayBtn setBackgroundImage:[kImage(@"ms_joyful_egg_smash_rank_btn_today")ms_SetImageForRTL] forState:UIControlStateSelected]; + [_todayBtn setTitleColor:[UIColor colorWithWhite:1 alpha:0.7] forState:UIControlStateNormal]; + [_todayBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; + [_todayBtn setTitle:YMLocalizedString(@"XPCandyRankContainerView0") forState:UIControlStateNormal]; + _todayBtn.titleLabel.font = kFontMedium(15); + _todayBtn.selected = YES; + [_todayBtn addTarget:self action:@selector(clickTodayBtnAction:) forControlEvents:UIControlEventTouchUpInside]; + } + return _todayBtn; +} +- (UIButton *)yesterdayBtn{ + if(!_yesterdayBtn){ + _yesterdayBtn = [UIButton new]; + [_yesterdayBtn setBackgroundImage:nil forState:UIControlStateNormal]; + [_yesterdayBtn setBackgroundImage:[kImage(@"ms_joyful_egg_smash_rank_btn_yesterday")ms_SetImageForRTL] forState:UIControlStateSelected]; + [_yesterdayBtn setTitleColor:[UIColor colorWithWhite:1 alpha:0.7] forState:UIControlStateNormal]; + [_yesterdayBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; + [_yesterdayBtn setTitle:YMLocalizedString(@"XPCandyRankContainerView1") forState:UIControlStateNormal]; + _yesterdayBtn.titleLabel.font = kFontMedium(15); + [_yesterdayBtn addTarget:self action:@selector(clickTodayBtnAction:) forControlEvents:UIControlEventTouchUpInside]; + } + return _yesterdayBtn; +} @end diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m index ca1904a7..40cc07b4 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m @@ -9,8 +9,7 @@ @interface XPCandyTreeBuySuccessView() ///返回 @property(nonatomic,strong) UIButton *closeView; -///标题图片 -@property(nonatomic,strong) UIImageView *titleView; +@property(nonatomic,strong) UIImageView *pi_bgIconView; ///精灵图标 @property(nonatomic,strong) UIImageView *pi_iconView; ///背景 @@ -38,10 +37,11 @@ [self addSubview:self.bgImageView]; - [self addSubview:self.titleView]; + [self.bgImageView addSubview:self.closeView]; [self.bgImageView addSubview:self.getView]; - [self.bgImageView addSubview:self.pi_iconView]; + [self.bgImageView addSubview:self.pi_bgIconView]; + [self.pi_bgIconView addSubview:self.pi_iconView]; [self.bgImageView addSubview:self.numView]; [self.bgImageView addSubview:self.chooseBnt]; [self.bgImageView addSubview:self.tipsView]; @@ -58,26 +58,25 @@ make.top.mas_equalTo(kGetScaleWidth(6)); make.trailing.mas_equalTo(-kGetScaleWidth(8)); }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.bgImageView.mas_top).mas_offset(0); - make.width.mas_equalTo(kGetScaleWidth(144)); - make.height.mas_equalTo(kGetScaleWidth(36)); - make.centerX.equalTo(self.bgImageView); - }]; + [self.getView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.titleView.mas_bottom).mas_offset(kGetScaleWidth(11)); + make.top.mas_equalTo(kGetScaleWidth(46)); make.height.mas_equalTo(kGetScaleWidth(20)); make.centerX.equalTo(self.bgImageView); }]; - [self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) { + [self.pi_bgIconView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(80)); make.centerX.equalTo(self.bgImageView); - make.top.equalTo(self.getView.mas_bottom).mas_offset(kGetScaleWidth(4)); + make.top.equalTo(self.getView.mas_bottom).mas_offset(4); + }]; + [self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.mas_equalTo(kGetScaleWidth(58)); + make.center.equalTo(self.pi_bgIconView); }]; [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.equalTo(self.bgImageView); make.height.mas_equalTo(kGetScaleWidth(22)); - make.top.equalTo(self.pi_iconView.mas_bottom).mas_offset(kGetScaleWidth(4)); + make.top.equalTo(self.pi_bgIconView.mas_bottom).mas_offset(kGetScaleWidth(4)); }]; [self.tipsView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.equalTo(self.bgImageView).mas_offset(kGetScaleWidth(6)); @@ -144,12 +143,12 @@ } return _pi_iconView; } --(UIImageView *)titleView{ - if(!_titleView){ - _titleView = [UIImageView new]; - _titleView.image = [UIImage getLanguageImage:@"room_candy_tree_buy_love_title"]; +- (UIImageView *)pi_bgIconView{ + if(!_pi_bgIconView){ + _pi_bgIconView = [UIImageView new]; + _pi_bgIconView.image = kImage(@"room_candy_tree_buy_love_icon_bg"); } - return _titleView; + return _pi_bgIconView; } - (UILabel *)numView{ if(!_numView){ diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuyView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuyView.m index 08e4ca88..93062efa 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuyView.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuyView.m @@ -98,7 +98,7 @@ make.trailing.mas_equalTo(-kGetScaleWidth(3)); }]; [self.textFieldBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(56)); + make.width.mas_equalTo(kGetScaleWidth(65)); make.height.mas_equalTo(kGetScaleWidth(18)); make.centerY.equalTo(self.bgImageView); make.trailing.equalTo(self.purchaseBtn.mas_leading).mas_offset(-kGetScaleWidth(6)); @@ -163,7 +163,7 @@ self.textField.text = @""; for (UIButton *btn in btnArr) { if(btn == sender){ - btn.backgroundColor = UIColorFromRGB(0x683FAD); + btn.backgroundColor = [UIColor colorWithWhite:1 alpha:0.2]; [btn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; }else{ btn.backgroundColor = [UIColor clearColor]; @@ -215,7 +215,7 @@ - (UIView *)loveNumBgVeiw{ if(!_loveNumBgVeiw){ _loveNumBgVeiw = [UIView new]; - _loveNumBgVeiw.backgroundColor = UIColorFromRGB(0x7748C7); + _loveNumBgVeiw.backgroundColor = [UIColor colorWithWhite:1 alpha:0.2]; _loveNumBgVeiw.layer.cornerRadius = kGetScaleWidth(16)/2; _loveNumBgVeiw.layer.masksToBounds = YES; } @@ -234,6 +234,7 @@ [_oneTapBtn setTitle:@"1" forState:UIControlStateNormal]; [_oneTapBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected]; [_oneTapBtn setTitleColor:[UIColor colorWithWhite:1 alpha:0.6] forState:UIControlStateNormal]; + _oneTapBtn.titleLabel.font = kFontMedium(10); _oneTapBtn.layer.cornerRadius = kGetScaleWidth(16)/2; _oneTapBtn.layer.masksToBounds = YES; @@ -271,7 +272,7 @@ if(!_textFieldBgView){ _textFieldBgView = [UIView new]; _textFieldBgView.backgroundColor = UIColorFromRGB(0x7748C7); - [_textFieldBgView setCornerWithLeftTopCorner:kGetScaleWidth(9) rightTopCorner:kGetScaleWidth(9) bottomLeftCorner:kGetScaleWidth(9) bottomRightCorner:kGetScaleWidth(9) size:CGSizeMake(kGetScaleWidth(56), kGetScaleWidth(18))]; + [_textFieldBgView setCornerWithLeftTopCorner:kGetScaleWidth(9) rightTopCorner:kGetScaleWidth(9) bottomLeftCorner:kGetScaleWidth(9) bottomRightCorner:kGetScaleWidth(9) size:CGSizeMake(kGetScaleWidth(65), kGetScaleWidth(18))]; } return _textFieldBgView; } diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyNumView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyNumView.m index 2fc67ab5..a6eb9ef5 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyNumView.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyNumView.m @@ -41,21 +41,23 @@ }]; [self.subtractBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(40)); - make.height.mas_equalTo(21); - make.top.mas_equalTo(1.2); - make.leading.mas_equalTo(kGetScaleWidth(6)); - }]; - [self.addBtn mas_makeConstraints:^(MASConstraintMaker *make) { + + make.width.mas_equalTo(kGetScaleWidth(40)); make.height.mas_equalTo(21); make.centerY.equalTo(self.subtractBtn); make.trailing.mas_equalTo(-kGetScaleWidth(6)); }]; + [self.addBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.mas_equalTo(kGetScaleWidth(40)); + make.height.mas_equalTo(21); + make.top.mas_equalTo(1.2); + make.leading.mas_equalTo(kGetScaleWidth(6)); + }]; [self.textFiled mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.equalTo(self.addBtn.mas_leading).mas_offset(-kGetScaleWidth(0)); - make.leading.equalTo(self.subtractBtn.mas_trailing).mas_offset(kGetScaleWidth(0)); + make.trailing.equalTo(self.subtractBtn.mas_leading).mas_offset(-kGetScaleWidth(0)); + make.leading.equalTo(self.addBtn.mas_trailing).mas_offset(kGetScaleWidth(0)); make.bottom.top.equalTo(self); }]; diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m index ef41f8a5..396d5c51 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m @@ -12,11 +12,11 @@ @property(nonatomic,strong) UIButton *closeView; ///精灵图标 +@property(nonatomic,strong) UIImageView *pi_bgIconView; @property(nonatomic,strong) UIImageView *pi_iconView; ///背景 @property(nonatomic,strong) UIImageView *bgImageView; -///标题图片 -@property(nonatomic,strong) UIImageView *titleView; + ///标题提示 @property(nonatomic,strong) UILabel *titleTipsView; ///数量 @@ -64,9 +64,7 @@ CGRect rect = self.bgImageView.frame; rect.origin.y = height; self.bgImageView.frame = rect; - CGRect titleRect = self.titleView.frame; - titleRect.origin.y = height; - self.titleView.frame = titleRect; + }]; @@ -79,9 +77,7 @@ CGRect rect = self.bgImageView.frame; rect.origin.y = (KScreenHeight - 315)/2; self.bgImageView.frame = rect; - CGRect titleRect = self.titleView.frame; - titleRect.origin.y = (KScreenHeight - 315)/2; - self.titleView.frame = titleRect; + }]; @@ -89,9 +85,10 @@ -(void)installUI{ [self addSubview:self.bgImageView]; - [self addSubview:self.titleView]; + [self.bgImageView addSubview:self.closeView]; - [self.bgImageView addSubview:self.pi_iconView]; + [self.bgImageView addSubview:self.pi_bgIconView]; + [self.pi_bgIconView addSubview:self.pi_iconView]; [self.bgImageView addSubview:self.numView]; [self.bgImageView addSubview:self.titleTipsView]; [self.bgImageView addSubview:self.buyBtn]; @@ -112,26 +109,25 @@ make.top.mas_equalTo(kGetScaleWidth(6)); make.trailing.mas_equalTo(-kGetScaleWidth(8)); }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.bgImageView.mas_top).mas_offset(0); - make.width.mas_equalTo(kGetScaleWidth(144)); - make.height.mas_equalTo(kGetScaleWidth(36)); - make.centerX.equalTo(self.bgImageView); - }]; + [self.titleTipsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.titleView.mas_bottom).mas_offset(kGetScaleWidth(14)); + make.top.mas_equalTo(kGetScaleWidth(46)); make.height.mas_equalTo(kGetScaleWidth(17)); make.centerX.equalTo(self.bgImageView); }]; - [self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) { + [self.pi_bgIconView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(80)); make.centerX.equalTo(self.bgImageView); make.top.equalTo(self.titleTipsView.mas_bottom).mas_offset(8); }]; + [self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.mas_equalTo(kGetScaleWidth(58)); + make.center.equalTo(self.pi_bgIconView); + }]; [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.equalTo(self.bgImageView); make.height.mas_equalTo(kGetScaleWidth(22)); - make.top.equalTo(self.pi_iconView.mas_bottom).mas_offset(kGetScaleWidth(5)); + make.top.equalTo(self.pi_bgIconView.mas_bottom).mas_offset(kGetScaleWidth(5)); }]; [self.buyBtn mas_makeConstraints:^(MASConstraintMaker *make) { @@ -156,10 +152,11 @@ } -(void)installUIWithBuy{ [self addSubview:self.bgImageView]; - [self addSubview:self.titleView]; + [self.bgImageView addSubview:self.closeView]; [self.bgImageView addSubview:self.titleTipsView]; - [self.bgImageView addSubview:self.pi_iconView]; + [self.bgImageView addSubview:self.pi_bgIconView]; + [self.pi_bgIconView addSubview:self.pi_iconView]; [self.bgImageView addSubview:self.numView]; [self.bgImageView addSubview:self.inputNumView]; [self.bgImageView addSubview:self.buyBtn]; @@ -177,26 +174,25 @@ make.top.mas_equalTo(kGetScaleWidth(6)); make.trailing.mas_equalTo(-kGetScaleWidth(8)); }]; - [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.bgImageView.mas_top).mas_offset(0); - make.width.mas_equalTo(kGetScaleWidth(144)); - make.height.mas_equalTo(kGetScaleWidth(36)); - make.centerX.equalTo(self.bgImageView); - }]; + [self.titleTipsView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.equalTo(self.titleView.mas_bottom).mas_offset(kGetScaleWidth(11)); + make.top.mas_equalTo(kGetScaleWidth(46)); make.height.mas_equalTo(kGetScaleWidth(17)); make.centerX.equalTo(self.bgImageView); }]; - [self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) { + [self.pi_bgIconView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(80)); make.centerX.equalTo(self.bgImageView); - make.top.equalTo(self.titleTipsView.mas_bottom).mas_offset(kGetScaleWidth(8)); + make.top.equalTo(self.titleTipsView.mas_bottom).mas_offset(8); + }]; + [self.pi_iconView mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.mas_equalTo(kGetScaleWidth(58)); + make.center.equalTo(self.pi_bgIconView); }]; [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.equalTo(self.bgImageView); make.height.mas_equalTo(kGetScaleWidth(22)); - make.top.equalTo(self.pi_iconView.mas_bottom).mas_offset(kGetScaleWidth(5)); + make.top.equalTo(self.pi_bgIconView.mas_bottom).mas_offset(kGetScaleWidth(5)); }]; [self.inputNumView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.numView.mas_bottom).mas_offset(kGetScaleWidth(5)); @@ -252,7 +248,7 @@ NSString *getPrice = @(self.price.integerValue * self.loveNum.integerValue).stringValue; NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@" %@",getPrice] attributes:@{NSFontAttributeName:self.numView.font,NSForegroundColorAttributeName:UIColorFromRGB(0xFF9A1F)}]; NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"room_candy_tree_buy_love_price"];; + UIImage *iconImage = [UIImage imageNamed:@"exchange_gold_icon"];; attachment.bounds = CGRectMake(0, roundf(self.numView.font.capHeight - iconImage.size.height)/2.f, iconImage.size.width, iconImage.size.height); attachment.image = iconImage; [textAtt insertAttributedString:[NSMutableAttributedString attributedStringWithAttachment:attachment] atIndex:0]; @@ -293,12 +289,12 @@ } return _pi_iconView; } --(UIImageView *)titleView{ - if(!_titleView){ - _titleView = [UIImageView new]; - _titleView.image = [UIImage getLanguageImage:@"room_candy_tree_confirm_buy_title"]; +- (UIImageView *)pi_bgIconView{ + if(!_pi_bgIconView){ + _pi_bgIconView = [UIImageView new]; + _pi_bgIconView.image = kImage(@"room_candy_tree_buy_love_icon_bg"); } - return _titleView; + return _pi_bgIconView; } - (UILabel *)numView{ if(!_numView){ @@ -310,7 +306,7 @@ if(!_chooseBnt){ _chooseBnt = [UIButton new]; [_chooseBnt setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; - [_chooseBnt setImage:kImage(@"room_candy_tree_buy_love_choose") forState:UIControlStateSelected]; + [_chooseBnt setImage:kImage(@" ") forState:UIControlStateSelected]; [_chooseBnt setImage:kImage(@"room_candy_tree_buy_love_no_choose") forState:UIControlStateNormal]; [_chooseBnt addTarget:self action:@selector(chooseTipAction) forControlEvents:UIControlEventTouchUpInside]; } @@ -339,9 +335,9 @@ if(!_buyBtn){ _buyBtn = [UIButton new]; [_buyBtn setBackgroundImage:kImage(@"room_candy_tree_buy_love_but_btn") forState:UIControlStateNormal]; - [_buyBtn setTitle:YMLocalizedString(@"PITreasureFairyBuyElfShardView1") forState:UIControlStateNormal]; - [_buyBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _buyBtn.titleLabel.font = kFontMedium(14); +// [_buyBtn setTitle:YMLocalizedString(@"PITreasureFairyBuyElfShardView1") forState:UIControlStateNormal]; +// [_buyBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; +// _buyBtn.titleLabel.font = kFontMedium(14); [_buyBtn addTarget:self action:@selector(bugShardAction) forControlEvents:UIControlEventTouchUpInside]; } return _buyBtn; diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeGiftView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeGiftView.m index cce3a8bc..93fbf073 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeGiftView.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeGiftView.m @@ -145,7 +145,7 @@ - (UIImageView *)diamondsImage{ if(!_diamondsImage){ _diamondsImage = [UIImageView new]; - _diamondsImage.image = kImage(@"room_candy_tree_buy_love_price"); + _diamondsImage.image = kImage(@"exchange_gold_icon"); } return _diamondsImage; } diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeRankView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeRankView.m index 64b1c156..3d614941 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeRankView.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeRankView.m @@ -132,7 +132,7 @@ } - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return self.datasource.count > 0 ? kGetScaleWidth(75) : kGetScaleWidth(300); + return self.datasource.count > 0 ? kGetScaleWidth(80) : kGetScaleWidth(300); } - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m index d76a39e2..19c42e34 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m @@ -41,7 +41,7 @@ #define KitemHeight (20 + 5) -@interface XPCandyTreeViewController () +@interface XPCandyTreeViewController () @property(nonatomic,strong) UIButton *backView; ///中间内容的容器 @@ -63,12 +63,10 @@ @property(nonatomic,strong) UIImageView *lampView; -///送礼物的特效 -@property (nonatomic,strong) SVGAImageView *candyTreeLightView; -///糖果树开启特效 + +///砸蛋特效 @property (nonatomic,strong) SVGAImageView *candyTreeOpenView; -///光 -@property (nonatomic,strong) SVGAImageView *candyTreeTransView; + ///寻爱一次 @property(nonatomic,strong) UIButton *fristLoveBtn; ///寻爱十次 @@ -213,99 +211,32 @@ } }]; - @kWeakify(self); - NSString * lightName = [NSString stringWithFormat:@"https://image.hfighting.com/candyTree_light.svga"]; - - NSString *baseFileName = @"/GiftSvga"; - NSString *filePath = [[[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:baseFileName] stringByAppendingPathComponent:lightName]; - NSFileManager *fileManager = [NSFileManager defaultManager]; - if ([fileManager fileExistsAtPath:filePath]){ - NSData *data=[NSData dataWithContentsOfFile:filePath options:0 error:NULL]; - [self.parser parseWithData:data cacheKey:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - if (videoItem != nil) { - self.candyTreeLightView.loops = 1; - self.candyTreeLightView.clearsAfterStop = YES; - self.candyTreeLightView.videoItem = videoItem; - [self.candyTreeLightView startAnimation]; - } - } failureBlock:^(NSError * _Nonnull error) { - - }]; - - - }else{ - [self.parser parseWithURL:[NSURL URLWithString:lightName] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - @kStrongify(self); - self.candyTreeLightView.loops = 1; - self.candyTreeLightView.clearsAfterStop = YES; - self.candyTreeLightView.videoItem = videoItem; - [self.candyTreeLightView startAnimation]; - } failureBlock:^(NSError * _Nonnull error) { - - }]; - }; - - - - NSString * openName = [NSString stringWithFormat:@"https://image.hfighting.com/candyTree_open.svga"]; - NSString *openFilePath = [[[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:baseFileName] stringByAppendingPathComponent:openName]; - if ([fileManager fileExistsAtPath:openFilePath]){ - NSData *data=[NSData dataWithContentsOfFile:openFilePath options:0 error:NULL]; - [self.parser parseWithData:data cacheKey:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - if (videoItem != nil) { - self.candyTreeOpenView.loops = 1; - self.candyTreeOpenView.clearsAfterStop = YES; - self.candyTreeOpenView.videoItem = videoItem; - [self.candyTreeOpenView startAnimation]; - } - } failureBlock:^(NSError * _Nonnull error) { - - }]; - - - }else{ - [self.parser parseWithURL:[NSURL URLWithString:lightName] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { +} +#pragma mark - SVGAPlayerDelegate +- (void)svgaPlayerDidFinishedAnimation:(SVGAPlayer *)player{ + if (self.isPicking){ + @kWeakify(self); + [self.parser parseWithNamed:@"pi_happy_egg_smash" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { @kStrongify(self); self.candyTreeOpenView.loops = 1; - self.candyTreeOpenView.clearsAfterStop = YES; + self.candyTreeOpenView.clearsAfterStop = NO; self.candyTreeOpenView.videoItem = videoItem; [self.candyTreeOpenView startAnimation]; } failureBlock:^(NSError * _Nonnull error) { - - }]; - }; - NSString * transformName = [NSString stringWithFormat:@"https://image.hfighting.com/candyTree_transform.svga"]; - NSString *transformFilePath = [[[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0] stringByAppendingPathComponent:baseFileName] stringByAppendingPathComponent:transformName]; - if ([fileManager fileExistsAtPath:transformFilePath]){ - NSData *data=[NSData dataWithContentsOfFile:transformFilePath options:0 error:NULL]; - [self.parser parseWithData:data cacheKey:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - if (videoItem != nil) { - self.candyTreeTransView.loops = 1; - self.candyTreeTransView.clearsAfterStop = YES; - self.candyTreeTransView.videoItem = videoItem; - [self.candyTreeTransView startAnimation]; - } - } failureBlock:^(NSError * _Nonnull error) { - }]; - - }else{ - [self.parser parseWithURL:[NSURL URLWithString:lightName] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { + @kWeakify(self); + [self.parser parseWithNamed:@"pi_happy_egg_smash" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { @kStrongify(self); - self.candyTreeTransView.loops = 1; - self.candyTreeTransView.clearsAfterStop = YES; - self.candyTreeTransView.videoItem = videoItem; - [self.candyTreeTransView startAnimation]; - self.candyTreeTransView.backgroundColor = [UIColor redColor]; + self.candyTreeOpenView.loops = 1; + self.candyTreeOpenView.clearsAfterStop = NO; + self.candyTreeOpenView.videoItem = videoItem; } failureBlock:^(NSError * _Nonnull error) { - - }]; - }; + }]; + } } - #pragma mark - NIMSystemNotificationManagerDelegate - (void)onReceiveCustomSystemNotification:(NIMCustomSystemNotification *)notification { if (notification.receiverType == NIMSessionTypeP2P) { @@ -329,18 +260,18 @@ [self.bgImageView addSubview:self.rankImageView]; [self.bgImageView addSubview:self.moreImageView]; [self.bgImageView addSubview:self.candyTreeView]; + [self.bgImageView addSubview:self.lampView]; - [self.bgImageView addSubview:self.eggView]; [self.bgImageView addSubview:self.plateView]; - - + [self.bgImageView addSubview:self.eggView]; + self.eggView.hidden = YES; [self.bgImageView addSubview:self.fristLoveBtn]; [self.bgImageView addSubview:self.tenthLoveBtn]; [self.bgImageView addSubview:self.hundredthLoveBtn]; [self.bgImageView addSubview:self.twoHundredhLoveBtn]; - [self.bgImageView addSubview:self.candyTreeLightView]; - [self.bgImageView addSubview:self.candyTreeOpenView]; - [self.bgImageView addSubview:self.candyTreeTransView]; + + [self.view addSubview:self.candyTreeOpenView]; + [self.bgImageView addSubview:self.animationView]; [self.bgImageView addSubview:self.buyView]; @@ -348,16 +279,15 @@ - // @kWeakify(self); - // [self.parser parseWithNamed:@"candyTree" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { - // @kStrongify(self); - // self.candyTreeView.loops = INT_MAX; - // self.candyTreeView.clearsAfterStop = NO; - // self.candyTreeView.videoItem = videoItem; - // [self.candyTreeView startAnimation]; - // } failureBlock:^(NSError * _Nonnull error) { - // - // }]; + @kWeakify(self); + [self.parser parseWithNamed:@"pi_happy_egg_smash" inBundle:[NSBundle mainBundle] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { + @kStrongify(self); + self.candyTreeOpenView.loops = 1; + self.candyTreeOpenView.clearsAfterStop = NO; + self.candyTreeOpenView.videoItem = videoItem; + } failureBlock:^(NSError * _Nonnull error) { + + }]; } - (void)initSubViewConstraints { @@ -411,59 +341,52 @@ make.height.mas_equalTo(kGetScaleWidth(126)); make.centerX.equalTo(self.bgImageView); }]; -// [self.candyTreeLightView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.edges.mas_equalTo(self.candyTreeView); -// }]; -// -// [self.candyTreeOpenView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.edges.mas_equalTo(self.candyTreeView); -// }]; -// -// [self.fristLoveBtn mas_makeConstraints:^(MASConstraintMaker *make) { -// make.bottom.equalTo(self.candyTreeView.mas_bottom).mas_offset(-kGetScaleWidth(8)); -// make.leading.mas_equalTo(kGetScaleWidth(14)); -// make.width.mas_equalTo(kGetScaleWidth(72)); -// make.height.mas_equalTo(kGetScaleWidth(53)); -// }]; -// [self.tenthLoveBtn mas_makeConstraints:^(MASConstraintMaker *make) { -// make.bottom.equalTo(self.candyTreeView.mas_bottom).mas_offset(-kGetScaleWidth(8)); -// make.leading.mas_equalTo(kGetScaleWidth(84)); -// make.width.mas_equalTo(kGetScaleWidth(72)); -// make.height.mas_equalTo(kGetScaleWidth(53)); -// }]; -// [self.hundredthLoveBtn mas_makeConstraints:^(MASConstraintMaker *make) { -// make.bottom.equalTo(self.candyTreeView.mas_bottom).mas_offset(-kGetScaleWidth(8)); -// make.leading.mas_equalTo(kGetScaleWidth(154)); -// make.width.mas_equalTo(kGetScaleWidth(72)); -// make.height.mas_equalTo(kGetScaleWidth(53)); -// }]; -// -// [self.twoHundredhLoveBtn mas_makeConstraints:^(MASConstraintMaker *make) { -// make.bottom.equalTo(self.candyTreeView.mas_bottom).mas_offset(-kGetScaleWidth(8)); -// make.leading.mas_equalTo(kGetScaleWidth(224)); -// make.width.mas_equalTo(kGetScaleWidth(72)); -// make.height.mas_equalTo(kGetScaleWidth(53)); -// }]; -// CGFloat kscale = (CGFloat)350 / (CGFloat)755; -// [self.candyTreeTransView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.top.mas_equalTo(self.candyTreeView); -// make.bottom.trailing.mas_equalTo(self.view); -// make.width.mas_equalTo(self.candyTreeTransView.mas_height).multipliedBy(kscale); -// }]; -// -// [self.buyView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.bottom.mas_equalTo(-kGetScaleWidth(23)); -// make.height.mas_equalTo(kGetScaleWidth(28)); -// make.width.mas_equalTo(kGetScaleWidth(288)); -// make.centerX.equalTo(self.bgImageView); -// }]; -// [self.animationView mas_makeConstraints:^(MASConstraintMaker *make) { -// make.leading.mas_equalTo(kGetScaleWidth(8)); -// make.bottom.mas_equalTo(self.bgImageView.mas_bottom).offset(-kGetScaleWidth(142)); -// make.trailing.mas_equalTo(-kGetScaleWidth(8)); -// make.height.mas_equalTo(kGetScaleWidth(23) * 5); -// }]; - + CGFloat top = KScreenHeight == 667 ? -8 : 132; + [self.candyTreeOpenView mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.width.height.mas_equalTo(self.view); + make.top.mas_equalTo(kGetScaleWidth(top)); + }]; + + [self.fristLoveBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.equalTo(self.lampView.mas_bottom).mas_offset(kGetScaleWidth(13)); + make.leading.mas_equalTo(kGetScaleWidth(17)); + make.width.mas_equalTo(kGetScaleWidth(78)); + make.height.mas_equalTo(kGetScaleWidth(53)); + }]; + [self.tenthLoveBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.equalTo(self.lampView.mas_bottom).mas_offset(kGetScaleWidth(13)); + make.leading.mas_equalTo(kGetScaleWidth(105)); + make.width.mas_equalTo(kGetScaleWidth(78)); + make.height.mas_equalTo(kGetScaleWidth(53)); + }]; + [self.hundredthLoveBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.equalTo(self.lampView.mas_bottom).mas_offset(kGetScaleWidth(13)); + make.leading.mas_equalTo(kGetScaleWidth(193)); + make.width.mas_equalTo(kGetScaleWidth(78)); + make.height.mas_equalTo(kGetScaleWidth(53)); + }]; + + [self.twoHundredhLoveBtn mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.equalTo(self.lampView.mas_bottom).mas_offset(kGetScaleWidth(13)); + make.leading.mas_equalTo(kGetScaleWidth(281)); + make.width.mas_equalTo(kGetScaleWidth(78)); + make.height.mas_equalTo(kGetScaleWidth(53)); + }]; + + + [self.buyView mas_makeConstraints:^(MASConstraintMaker *make) { + make.bottom.mas_equalTo(-kGetScaleWidth(23)); + make.height.mas_equalTo(kGetScaleWidth(28)); + make.width.mas_equalTo(kGetScaleWidth(288)); + make.centerX.equalTo(self.bgImageView); + }]; + [self.animationView mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.mas_equalTo(kGetScaleWidth(8)); + make.bottom.mas_equalTo(self.bgImageView.mas_bottom).offset(-kGetScaleWidth(142)); + make.trailing.mas_equalTo(-kGetScaleWidth(8)); + make.height.mas_equalTo(kGetScaleWidth(23) * 5); + }]; + } - (void)giftViewRemoveFromSuperView:(UIView *)view { @@ -503,6 +426,7 @@ - (void)pickButtonActionWithNum:(NSInteger)num{ if (self.isPicking) return; self.isPicking = YES; + [self.candyTreeOpenView startAnimation]; ///摘 RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; @@ -655,32 +579,19 @@ return _candyTreeView; } -- (SVGAImageView *)candyTreeLightView { - if (!_candyTreeLightView) { - _candyTreeLightView = [[SVGAImageView alloc]init]; - _candyTreeLightView.backgroundColor = [UIColor clearColor]; - _candyTreeLightView.userInteractionEnabled = NO; - } - return _candyTreeLightView; -} + - (SVGAImageView *)candyTreeOpenView { if (!_candyTreeOpenView) { _candyTreeOpenView = [[SVGAImageView alloc]init]; _candyTreeOpenView.backgroundColor = [UIColor clearColor]; _candyTreeOpenView.userInteractionEnabled = NO; + _candyTreeOpenView.delegate = self; } return _candyTreeOpenView; } -- (SVGAImageView *)candyTreeTransView { - if (!_candyTreeTransView) { - _candyTreeTransView = [[SVGAImageView alloc]init]; - _candyTreeTransView.backgroundColor = [UIColor clearColor]; - _candyTreeTransView.userInteractionEnabled = NO; - } - return _candyTreeTransView; -} + - (SVGAParser *)parser { if (!_parser) { diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m index c4b65f46..f5b1ca01 100644 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m +++ b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m @@ -346,13 +346,13 @@ RoomInfoModel * roomInfo = self.delegate.getRoomInfo; UserInfoModel * userInfo = self.delegate.getUserInfo; - if (userInfo.isFirstCharge) { - [self.giftButton setImage:[UIImage getLanguageImage:@"room_menu_gift_first_recharge"] forState:UIControlStateNormal]; - [self.giftButton setImage:[UIImage getLanguageImage:@"room_menu_gift_first_recharge"] forState:UIControlStateSelected]; - } else { +// if (userInfo.isFirstCharge) { +// [self.giftButton setImage:[UIImage getLanguageImage:@"room_menu_gift_first_recharge"] forState:UIControlStateNormal]; +// [self.giftButton setImage:[UIImage getLanguageImage:@"room_menu_gift_first_recharge"] forState:UIControlStateSelected]; +// } else { [self.giftButton setImage:[UIImage imageNamed:@"room_menu_gift"] forState:UIControlStateNormal]; [self.giftButton setImage:[UIImage imageNamed:@"room_menu_gift"] forState:UIControlStateSelected]; - } +// } self.arrangeMicButton.hidden = roomInfo.roomModeType != RoomModeType_Open_Micro_Mode; if (roomInfo.roomModeType == RoomModeType_Open_Blind || roomInfo.roomModeType == RoomModeType_Open_PK_Mode || roomInfo.roomModeType == RoomModeType_Open_Micro_Mode) { diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.h b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.h index 8e268ee9..50ba1a8f 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.h +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.h @@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN @interface XPMessageInfoModel : PIBaseModel @property(nonatomic,strong) PIRoomPhotoAlbumItemModel *albumModel; +@property(nonatomic,copy) NSString *vipIcon; @property(nonatomic,strong) NSString *charmUrl; @property(nonatomic,strong) NSString *experUrl; @property(nonatomic,assign) int first; diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.m index 17d7fbb3..7724f6df 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.m @@ -28,6 +28,7 @@ - (void)setContent:(NSAttributedString *)content { _content = content; CGFloat width = isMSRTL() ? 10 : 0; +// width = self.vipIcon.length > 0 ? width + 15 : width; CGSize maxSize = CGSizeMake(kRoomMessageMaxWidth - self.contentLeftMargin - self.contentRightMargin - 12, MAXFLOAT); YYTextContainer *container = [YYTextContainer containerWithSize:maxSize]; container.maximumNumberOfRows = 0; diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m index ef68dbfa..25d0aa2d 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m @@ -209,7 +209,7 @@ } if (model.vipIcon) {//VIPicon - [attribute appendAttributedString:[self createUrlImageAttribute:model.vipIcon]]; + [attribute appendAttributedString:[self createUrlImageAttribute:model.vipIcon size:CGSizeMake(20, 20)]]; [attribute appendAttributedString:[self createSapceAttribute:2]]; } if (model.experUrl) { @@ -256,6 +256,7 @@ } [self attributeAddLongPressHihtLight:attribute uid:message.from nick:((NIMMessageChatroomExtension *)message.messageExt).roomNickname]; messageInfo.content = attribute; + messageInfo.vipIcon = model.vipIcon; return messageInfo; } @@ -310,7 +311,8 @@ } if (extModel.vipIcon.length > 0) {//VIPicon - [attribute appendAttributedString:[self createUrlImageAttribute:extModel.vipIcon]]; + messageInfo.vipIcon = extModel.vipIcon; + [attribute appendAttributedString:[self createUrlImageAttribute:extModel.vipIcon size:CGSizeMake(20, 20)]]; [attribute appendAttributedString:[self createSapceAttribute:2]]; } if (extModel.experUrl.length > 0) {//等级 diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m index 705f2a63..f381d3ed 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m @@ -121,6 +121,7 @@ [self.playBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.trailing.mas_equalTo(-kGetScaleWidth(18)); + make.width.mas_equalTo(kGetScaleWidth(40)); make.centerY.equalTo(self.bgImageView); }]; [self.pi_BannerView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -169,7 +170,7 @@ - (UIImageView *)bgImageView { if (!_bgImageView) { _bgImageView = [[UIImageView alloc] init]; - _bgImageView.image = [UIImage imageNamed:@"gift_lucky_broadcast_bg"]; + _bgImageView.image = [[UIImage imageNamed:@"gift_lucky_broadcast_bg"] ms_SetImageForRTL]; _bgImageView.contentMode = UIViewContentModeScaleToFill; } return _bgImageView; @@ -181,6 +182,7 @@ [_playBtn setTitle:YMLocalizedString(@"XPGiftLuckyGiftBroadcastView0") forState:UIControlStateNormal]; [_playBtn setTitleColor:UIColorFromRGB(0xEB547C) forState:UIControlStateNormal]; _playBtn.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightSemibold]; + _playBtn.titleLabel.numberOfLines = 2; [_playBtn addTarget:self action:@selector(playButtonAction) forControlEvents:UIControlEventTouchUpInside]; } return _playBtn; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m index 7898c277..dd566272 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m @@ -157,7 +157,7 @@ } -(void)setUserModel:(XPWeekStarRankUserModel *)userModel{ _userModel = userModel; - _bgImageView.image = _userModel.type == 0 ? [UIImage getLanguageImage:@"gift_twelve_star_Banner_naming_bg"]:[UIImage getLanguageImage:@"gift_twelve_star_Banner_rich_bg"]; + _bgImageView.image = _userModel.type == 0 ? [UIImage getLanguageImage:@"gift_twelve_star_Banner_naming_bg"] :[UIImage getLanguageImage:@"gift_twelve_star_Banner_rich_bg"]; NSString *name = _userModel.nick; _nameView.text = name; if(_userModel.type == 1){ @@ -189,14 +189,18 @@ [self.skipBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.trailing.equalTo(self.arrowView.mas_leading).mas_offset(-kGetScaleWidth(2)); make.centerY.equalTo(self.contentView); - make.width.mas_equalTo(kGetScaleWidth(32)); - make.height.mas_equalTo(kGetScaleWidth(14)); + make.width.mas_equalTo(kGetScaleWidth(40)); + }]; [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.equalTo(self.headView.mas_trailing).mas_offset(kGetScaleWidth(4)); make.centerY.equalTo(self.contentView); make.trailing.equalTo(self.skipBtn.mas_leading).mas_offset(-kGetScaleWidth(2)); }]; + if (isMSRTL()){ + self.nameView.textAlignment = NSTextAlignmentRight; + } + } @@ -233,6 +237,8 @@ [_skipBtn setTitle:YMLocalizedString(@"XPGiftLuckyGiftBroadcastCell6") forState:UIControlStateNormal]; _skipBtn.titleLabel.font = kFontRegular(10); [_skipBtn setTitleColor:UIColorFromRGB(0xFFE694) forState:UIControlStateNormal]; + _skipBtn.titleLabel.numberOfLines = 2; + _skipBtn.titleLabel.adjustsFontSizeToFitWidth = YES; } return _skipBtn; } diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m index 4ed33ede..a94f961e 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomTopicViewController.m @@ -173,6 +173,7 @@ _textField.font = [UIFont systemFontOfSize:13]; _textField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:YMLocalizedString(@"XPRoomTopicViewController2") attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:13], NSForegroundColorAttributeName : [DJDKMIMOMColor textThirdColor]}]; _textField.tintColor = [DJDKMIMOMColor appMainColor]; + _textField.textColor = [DJDKMIMOMColor mainTextColor]; UIView *searchIconView = [[UIView alloc] init]; searchIconView.frame = CGRectMake(0, 0, 7, 10); _textField.leftView = searchIconView; diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m index d8e039dc..770972f2 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m +++ b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m @@ -260,7 +260,7 @@ [self.nobleIconImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.mas_equalTo(self.headWearImageView.mas_trailing).offset(5); make.top.mas_equalTo(self.avatarImageView); - make.height.mas_equalTo(20); + make.height.mas_equalTo(30); make.width.mas_equalTo(0); }]; @@ -298,11 +298,11 @@ }]; [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(20); + make.width.mas_equalTo(34); }]; [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.height.mas_equalTo(20); + make.width.mas_equalTo(34); }]; [self.newUserImageView mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m index 802b739f..e7d67deb 100644 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m @@ -1675,6 +1675,10 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 if (broadcastMessage.content) { NSDictionary *msgDictionary = [broadcastMessage.content toJSONObject]; AttachmentModel *attachment = [AttachmentModel modelWithJSON:msgDictionary[@"body"]]; + NSString *partitionId = [NSString stringWithFormat:@"%@",attachment.data[@"partitionId"]]; + if(![partitionId isEqualToString:self.getUserInfo.partitionId]){ + return; + } BOOL isHave = NO; if(attachment.first == CustomMessageType_Look_Love && attachment.second == Custom_Message_Sub_Look_Love_InRoom_NeedAllMicSend){ isHave = YES; diff --git a/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m b/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m index 43d91e3b..c1aeb9da 100644 --- a/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m +++ b/YuMi/Modules/YMTabbar/View/PIFullScreenBannerAnimation.m @@ -252,7 +252,11 @@ SVGAParser *parser = [SVGAParser new]; [parser parseWithURL:[NSURL URLWithString:model.resourceContent] completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { model.videoItem = videoItem; - bannerView = [[PIUniversalBannerView alloc]initWithFrame:CGRectMake(KScreenWidth, top, kGetScaleWidth(model.resourceWidth), kGetScaleWidth(model.resourceHeight)) ]; + CGFloat height = kGetScaleWidth(60); + if(videoItem.videoSize.width > 0){ + height = KScreenWidth * videoItem.videoSize.height / videoItem.videoSize.width; + } + bannerView = [[PIUniversalBannerView alloc]initWithFrame:CGRectMake(KScreenWidth, top, KScreenWidth, height)]; [self showGeneralFloatingScreenView:bannerView model:model]; } failureBlock:^(NSError * _Nonnull error) { [bannerView removeFromSuperview]; diff --git a/YuMi/Modules/YMTabbar/View/TabbarViewController.m b/YuMi/Modules/YMTabbar/View/TabbarViewController.m index 8fac14fb..75d91d84 100644 --- a/YuMi/Modules/YMTabbar/View/TabbarViewController.m +++ b/YuMi/Modules/YMTabbar/View/TabbarViewController.m @@ -151,7 +151,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; [[NIMSDK sharedSDK].chatManager addDelegate:self]; [[NIMSDK sharedSDK].systemNotificationManager addDelegate:self]; [[NIMSDK sharedSDK].broadcastManager addDelegate:self]; - [self.presenter juliandAdCallBackApi]; + [self networkReachability]; [self.view addSubview:self.roomMineView]; @kWeakify(self); @@ -373,11 +373,7 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; } -(void)dealWithDefaultSvga{ - ///寻爱之旅动效 - NSArray *loveList = @[@"https://image.hfighting.com/candyTree_light.svga",@"https://image.hfighting.com/candyTree_open.svga",@"https://image.hfighting.com/candyTree_transform.svga"]; - for (NSString *url in loveList) { - [self dealWithGiftListWithUrl:url fileName:url isSvga:YES]; - } + ///夺宝精灵动效 NSArray *elfList = @[@"https://image.hfighting.com/fenjie2.mp4",@"https://image.hfighting.com/treasure_fairy_ten.mp4",@"https://image.hfighting.com/hecheng3.mp4",@"https://image.hfighting.com/treasure_fairy_one.mp4"]; for (NSString *url in elfList) { @@ -595,6 +591,12 @@ UIKIT_EXTERN NSString *kTabShowAnchorCardKey; if (broadcastMessage.content) { NSDictionary *msgDictionary = [broadcastMessage.content toJSONObject]; AttachmentModel *attachment = [AttachmentModel modelWithJSON:msgDictionary[@"body"]]; + NSString *partitionId = [NSString stringWithFormat:@"%@",attachment.data[@"partitionId"]]; + if(![partitionId isEqualToString:self.userInfo.partitionId]){ + return; + } + + if (attachment.first == CustomMessageType_RedPacket) { [self receiveRedPacketDealWithData:attachment]; } else if (attachment.first == CustomMessageType_Gift && attachment.second == Custom_Message_Sub_Gift_ChannelNotify){///广播 年度飘屏 diff --git a/YuMi/Modules/YMWeb/PIWebViewSavePhotoView.m b/YuMi/Modules/YMWeb/PIWebViewSavePhotoView.m index 18533f42..6f83574f 100644 --- a/YuMi/Modules/YMWeb/PIWebViewSavePhotoView.m +++ b/YuMi/Modules/YMWeb/PIWebViewSavePhotoView.m @@ -125,7 +125,7 @@ - (UIImageView *)topTextImageView{ if(!_topTextImageView){ _topTextImageView = [UIImageView new]; - _topTextImageView.image = kImage(@"pi_webView_code_top_text"); + _topTextImageView.image = [UIImage getLanguageImage:@"pi_webView_code_top_text"]; } return _topTextImageView; } diff --git a/YuMi/Network/HttpRequestHelper.m b/YuMi/Network/HttpRequestHelper.m index 1866a6f2..28b21edc 100644 --- a/YuMi/Network/HttpRequestHelper.m +++ b/YuMi/Network/HttpRequestHelper.m @@ -11,6 +11,9 @@ #import "YYReachability.h" #import #import "YUMIMacroUitls.h" +#import "MSParamsDecode.h" + + @implementation HttpRequestHelper +(AFHTTPSessionManager *)requestManager @@ -60,8 +63,12 @@ } [self configHeaders]; - params = [self configBaseParmars:params]; AFHTTPSessionManager *manager = [HttpRequestHelper requestManager]; + params = [MSParamsDecode msDecodeParams:[params mutableCopy] ]; + + + params = [self configBaseParmars:params]; + #ifdef DEBUG NSLog(@"\nmethod:\n%@\nparameter:\n%@", method, params); #endif @@ -107,8 +114,12 @@ } [self configHeaders]; - params = [self configBaseParmars:params]; AFHTTPSessionManager *manager = [HttpRequestHelper requestManager]; + params = [MSParamsDecode msDecodeParams:[params mutableCopy] ]; + + + params = [self configBaseParmars:params]; + #ifdef DEBUG NSLog(@"\nmethod:\n%@\nparameter:\n%@", method, params); @@ -131,6 +142,7 @@ }); #else #endif + success(baseModel); } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) { [self handleNetError:error method:method failure:failure]; @@ -151,6 +163,7 @@ } [self configHeaders]; + params = [MSParamsDecode msDecodeParams:[params mutableCopy] ]; params = [self configBaseParmars:params]; AFHTTPSessionManager *manager = [HttpRequestHelper requestManager]; #ifdef DEBUG @@ -232,14 +245,14 @@ }else { [client.requestSerializer setValue:nil forHTTPHeaderField:@"pub_ticket"]; } - [client.requestSerializer setValue:[NSBundle uploadLanguageText] forHTTPHeaderField:@"Accept-Language"]; + [client.requestSerializer setValue:PI_App_Version forHTTPHeaderField:@"App-Version"]; } + (NSDictionary*)configBaseParmars:(NSDictionary *)parmars { NSDictionary *defaultBasciParame = @{ - @"Accept-Language" : [NSBundle uploadLanguageText], + @"Accept-Language":[NSBundle uploadLanguageText], @"os" : @"iOS", @"osVersion" : [YYUtility systemVersion], @"netType" : ([YYUtility networkStatus] == ReachableViaWiFi) ? @2 : @1, @@ -324,6 +337,8 @@ } [self configHeaders]; + params = [MSParamsDecode msDecodeParams:[params.mj_JSONObject mutableCopy] ].toJSONString; + NSDictionary *baseParams = [self configBaseParmars:nil]; AFHTTPSessionManager *manager = [HttpRequestHelper requestManager]; NSString *url = [self getHostUrl]; diff --git a/YuMi/Network/MSParamsDecode.h b/YuMi/Network/MSParamsDecode.h new file mode 100644 index 00000000..19aca875 --- /dev/null +++ b/YuMi/Network/MSParamsDecode.h @@ -0,0 +1,21 @@ +// +// MSParamsDecode.h +// YuMi +// +// Created by duoban on 2024/4/23. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface MSParamsDecode : NSObject +/** + 加密方法 + @param params 参数 + */ ++ (NSMutableDictionary *)msDecodeParams:(NSMutableDictionary *)params ; + +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/Network/MSParamsDecode.m b/YuMi/Network/MSParamsDecode.m new file mode 100644 index 00000000..f4eea039 --- /dev/null +++ b/YuMi/Network/MSParamsDecode.m @@ -0,0 +1,65 @@ +// +// MSParamsDecode.m +// YuMi +// +// Created by duoban on 2024/4/23. +// + +#import "MSParamsDecode.h" + +@implementation MSParamsDecode ++ (NSMutableDictionary *)msDecodeParams:(NSMutableDictionary *)params { + if (!params) { + params = [NSMutableDictionary dictionary]; + } + + [params setObject:[MSParamsDecode msSign:[params mutableCopy]] forKey:@"pub_sign"]; + return params; +} + + ++ (NSString *)msSign:(NSMutableDictionary *)dic { + [dic removeObjectForKey:@"Accept-Language"]; + [dic removeObjectForKey:@"ticket"]; + [dic removeObjectForKey:@"pub_uid"]; + [dic removeObjectForKey:@"appVersion"]; + [dic removeObjectForKey:@"appVersionCode"]; + [dic removeObjectForKey:@"channel"]; + [dic removeObjectForKey:@"deviceId"]; + [dic removeObjectForKey:@"ispType"]; + [dic removeObjectForKey:@"netType"]; + [dic removeObjectForKey:@"os"]; + [dic removeObjectForKey:@"osVersion"]; + [dic removeObjectForKey:@"app"]; + [dic removeObjectForKey:@"ticket"]; + [dic removeObjectForKey:@"client"]; + [dic removeObjectForKey:@"channel"]; + [dic removeObjectForKey:@"deviceId"]; + [dic removeObjectForKey:@"lang"]; + [dic removeObjectForKey:@"mcc"]; + + + NSMutableString *stringA = [NSMutableString string]; + //按字典key升序排序 + NSArray *sortKeys = [[dic allKeys] sortedArrayUsingSelector:@selector(compare:)]; + //拼接格式 “key0=value0&key1=value1&key2=value2” + for (NSString *key in sortKeys) { + [stringA appendString:[NSString stringWithFormat:@"%@=%@&", key, dic[key]]]; + } + //拼接参数加密签名 PARAMSSECRET + [stringA appendString:[NSString stringWithFormat:@"key=%@", KeyWithType(KeyType_Sign)]]; + //MD5加密签名 + NSString *stringB = [stringA MD5String]; + //返回大写字母 + return stringB.uppercaseString; +} + ++ (NSString *)uuidString{ + CFUUIDRef uuid_ref = CFUUIDCreate(NULL); + CFStringRef uuid_string_ref= CFUUIDCreateString(NULL, uuid_ref); + NSString *uuid = [NSString stringWithString:(__bridge NSString *)uuid_string_ref]; + CFRelease(uuid_ref); + CFRelease(uuid_string_ref); + return [uuid lowercaseString]; +} +@end diff --git a/YuMi/Resources/pi_happy_egg_smash.svga b/YuMi/Resources/pi_happy_egg_smash.svga new file mode 100644 index 00000000..a2b236db Binary files /dev/null and b/YuMi/Resources/pi_happy_egg_smash.svga differ diff --git a/YuMi/Structure/MVP/Model/UserInfoModel.h b/YuMi/Structure/MVP/Model/UserInfoModel.h index df3b8d0e..29e88443 100644 --- a/YuMi/Structure/MVP/Model/UserInfoModel.h +++ b/YuMi/Structure/MVP/Model/UserInfoModel.h @@ -141,7 +141,7 @@ NS_ASSUME_NONNULL_BEGIN ///声音卡 @property (nonatomic,strong) XPSoundCardModel *audioCard; - +@property(nonatomic,copy) NSString *partitionId; /// /// @property (nonatomic,strong) NSMutableAttributedString *levelAtt; diff --git a/YuMi/Tools/YYUtility/YYUtility+App.m b/YuMi/Tools/YYUtility/YYUtility+App.m index 21733087..7c5ac467 100644 --- a/YuMi/Tools/YYUtility/YYUtility+App.m +++ b/YuMi/Tools/YYUtility/YYUtility+App.m @@ -33,19 +33,10 @@ } + (NSString *)appName { -#ifdef DEBUG - NSString *isProduction = [[NSUserDefaults standardUserDefaults]valueForKey:@"kIsProductionEnvironment"]; - if([isProduction isEqualToString:@"YES"]){ - return @"youmi"; - } + return @"molistar"; -#else - return @"youmi"; - -#endif - } @@ -135,7 +126,7 @@ static NSString *_from = nil; _from = from; } else { if (isEnterprise == NO) { - _from = @"MoliStar_Enterprise"; // 企业包 + _from = @"molistar_enterprise"; // 企业包 }else { _from = PI_App_Source; //appstore App Store包 } diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index 8080f190..7d635be0 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -32,7 +32,7 @@ "XPCandyTreeMoreRuleCell0" = "يمكن استخدام الثروة عندما تصل إلى مستوى %ld، هيا ارتقِ بسرعة~"; -"XPCandyTreeViewController2" = "عدد شراء القلوب لا يمكن أن يكون صفر!"; +"XPCandyTreeViewController2" = "!لا يمكن أن يكون عدد المطارق المشتراة صفر"; "XPCandyTreeViewController4" = "الانضمام"; "XPCandyTreeViewController5" = "يمكنك فقط تحديد 99999 مرة في المرة الواحدة"; "XPCandyTreeViewController7" = "قائمة الأفضل"; @@ -684,7 +684,7 @@ "XPForgetPwdViewController2" = "تمت إعادة تعيين كلمة المرور بنجاح"; "XPForgetPwdViewController3" = "نسيت كلمة المرور"; "XPForgetPwdViewController4" = "الرجاء إدخال رقم الهاتف"; -"XPForgetPwdViewController5" = "الرجاء إدخال رمز التحقق"; + "XPForgetPwdViewController6" = "الرجاء إدخال كلمة المرور (6-16 حرفًا)"; "XPLoginPwdViewController0" = "تم تسجيل الدخول بنجاح"; @@ -2049,7 +2049,7 @@ ineHeadView12" = "الحمل"; "XPRoomMessageParser74" = "تم إغلاق"; "XPRoomMessageParser75" = "%d موضع الميكروفون"; "XPRoomMessageParser76" = "لميكروفون الحرية"; -"XPRoomMessageParser77" = "رائع! %@ حصل على %@%@ من خلال رحلة البحث عن الحب."; +"XPRoomMessageParser77" = "رائع! %@ تم الحصول على %@ %@ من خلال كسر البيضة بفرح"; "XPRoomMessageParser79" = "(مرئي فقط للنفس)"; "XPRoomMessageParser80" = "الVIP يحين! تهانينا"; "XPRoomMessageParser81" = "افتتاح نظام VIP، حصل على"; @@ -2244,7 +2244,7 @@ ineHeadView12" = "الحمل"; "XPRoomNobleLevelUpView0" = "تفجير المسرح! تهانينا "; "XPRoomNobleLevelUpView1" = "تمت ترقية الVIP إلى %@!"; -"XPRoomCandyGiftView0" = "رائع! %@ حصل على %@%@ من خلال رحلة البحث عن الحب."; +"XPRoomCandyGiftView0" = "رائع! %@ تم الحصول على %@ %@ من خلال كسر البيضة بفرح"; @@ -2258,7 +2258,7 @@ ineHeadView12" = "الحمل"; "XPRoomAnchorRankBannerView0" = "تهانينا %@ لتصبح الأول في قائمة الساعة لهذه الفترة"; "XPRoomAnchorRankBannerView1" = "الأول في قائمة الساعة"; -"XPRoomLuckyBigPrizeView0" = "حظ ممتاز! ربح %@ عملة بقيمة %@ في %@"; +"XPRoomLuckyBigPrizeView0" = "%@ محظوظ جدًا! تم فتح عملات ذهبية بقيمة %@ بقيمة %@ في %@"; "XPRoomQuickMessageContainView0" = "أرسلت رسائل بشكل متكرر جدًا، يرجى المحاولة لاحقًا"; @@ -3232,6 +3232,7 @@ ineHeadView12" = "الحمل"; "XPNobleCenterEntranceView0" = "تبقى %@ قيمة السلطة للترقية"; "XPNobleCenterEntranceView1" = "مركز VIP"; "XPNobleCenterEntranceView2" = "افتح واستمتع بجميع الامتيازات"; +"XPNobleCenterEntranceView3" = "حاليا أعلى مستوى"; ///XPNobleCenterPayView "XPNobleCenterPayView0" = "الدفع"; @@ -3613,10 +3614,10 @@ ineHeadView12" = "الحمل"; "PITreasureFairyBuyElfShardView3"="تمت عملية الشحن بنجاح"; ///XPCandyTreeConfirmBuyView -"XPCandyTreeConfirmBuyView0"="النقاط المتاحة غير كافية، يرجى الشراء"; -"XPCandyTreeConfirmBuyView1"="شراء %@ نقطة"; +"XPCandyTreeConfirmBuyView0"="المطارق المتاحة غير كافية، يرجى شراء"; +"XPCandyTreeConfirmBuyView1"="شراء %@ مطرقة"; ///XPCandyTreeBuyView -"XPCandyTreeBuyView0"="يرجى تحديد أو إدخال كمية النقاط التي ترغب في شرائها"; +"XPCandyTreeBuyView0"="يرجى اختيار أو إدخال عدد المطارق التي ترغب في شرائها"; ///PIMessageContentServiceReplyView "PIMessageContentServiceReplyView0"="كيفية الشحن:"; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index 7264a4ec..e7f3f5f3 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -435,12 +435,12 @@ "XPCandyTreeEmptyableViewCell0" = "No data available"; "XPCandyTreeMoreRuleCell0" = "Fortune value reaches level %ld to use, hurry up and upgrade~"; -"XPCandyTreeViewController2" = "Cannot buy love with 0 quantity!"; +"XPCandyTreeViewController2" = "The number of hammers purchased cannot be zero!"; "XPCandyTreeViewController4" = "Join now"; "XPCandyTreeViewController5" = "Only 99999 times can be selected at a time"; "XPCandyTreeViewController7" = "Leaderboard"; -"XPCandyRankContainerView0" = "Today's Rankings"; -"XPCandyRankContainerView1" = "Yesterday's Rankings"; +"XPCandyRankContainerView0" = "Today"; +"XPCandyRankContainerView1" = "Yesterday"; "XPCandyTreeInsufficientBalanceView0" = "Reminder"; "XPCandyTreeInsufficientBalanceView1" = "Insufficient Coins balance, please recharge first~"; "XPCandyTreeInsufficientBalanceView2" = "Recharge now"; @@ -1787,7 +1787,7 @@ "XPRoomMessageParser74" = "Closed"; "XPRoomMessageParser75" = "Mic %d"; "XPRoomMessageParser76" = "as Free Mic"; -"XPRoomMessageParser77" = "Awesome! %@ obtained %@%@ through a journey of seeking love"; +"XPRoomMessageParser77" = "Awesome! %@ obtained %@ %@ via joyful egg smash"; "XPRoomMessageParser79" = "(Visible only to yourself)"; "XPRoomMessageParser80" = "VIP has arrived! Congratulations"; "XPRoomMessageParser81" = "on opening the VIPe system, obtaining"; @@ -1857,7 +1857,7 @@ "XPGiftLuckyGiftBroadcastCell0" = "Congratulations "; "XPGiftLuckyGiftBroadcastCell1" = "Opened %@, obtained "; -"XPGiftLuckyGiftBroadcastView0" = "Gameplay Instructions"; +"XPGiftLuckyGiftBroadcastView0" = "Game Rules"; "XPSendGiftView0" = "Can only send all to one person"; "XPSendGiftView1" = "Can only send all to one person"; @@ -1979,7 +1979,7 @@ "XPRoomNobleLevelUpView0" = "Set the stage on fire! Congratulations "; "XPRoomNobleLevelUpView1" = "VIP status upgraded to %@!"; -"XPRoomCandyGiftView0" = "Awesome! %@ obtained %@%@ through a journey of seeking love"; +"XPRoomCandyGiftView0" = "Awesome! %@ obtained %@ %@ via joyful egg smash"; "XPRoomEnterHideTipView0" = "You entered the room invisibly~"; @@ -3050,7 +3050,7 @@ "XPNobleCenterEntranceView0" = "%@ Points to Upgrade"; "XPNobleCenterEntranceView1" = "VIP Center"; "XPNobleCenterEntranceView2" = "Open to enjoy various privileges"; - +"XPNobleCenterEntranceView3" = "Currently max level"; "XPNobleCenterPayView0" = "Payment"; "XPNobleCenterPayView1" = "Coins"; "XPNobleCenterPayView2" = "Coins Payment"; @@ -3395,9 +3395,9 @@ //XPHomeRecommendOtherRoomView "XPHomeRecommendOtherRoomView0"="No suitable rooms for now, recommending other rooms for you~"; "XPHomeRecommendOtherRoomView1"="Go and check"; - +"XPLoginPhoneViewController6" = "Verification code"; ///XPTreasureFairyBottomView -"XPTreasureFairyBottomView0"="Enter Quantity"; +"XPTreasureFairyBottomView0"="Enter qty"; "XPTreasureFairyBottomView1"="Buy"; "XPTreasureFairyBottomView2"="Please select or enter the number of fragments to buy"; @@ -3412,10 +3412,10 @@ "PITreasureFairyBuyElfShardView3"="Recharge Successful"; ///XPCandyTreeConfirmBuyView -"XPCandyTreeConfirmBuyView0"="Insufficient available love, please purchase"; -"XPCandyTreeConfirmBuyView1"="Buy %@ love"; +"XPCandyTreeConfirmBuyView0"="Insufficient hammers available, please purchase"; +"XPCandyTreeConfirmBuyView1"="Purchase %@ hammers"; ///XPCandyTreeBuyView -"XPCandyTreeBuyView0"="Please select or enter the number of love to buy"; +"XPCandyTreeBuyView0"="Please select or enter the number of hammers to purchase"; ///PIMessageContentServiceReplyView "PIMessageContentServiceReplyView0"="How to Top-Up:"; diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index 116df249..9ff54674 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -24,7 +24,7 @@ ///XPCandyTreeViewController.m -"XPCandyTreeViewController2" = "购买爱心数量不能为0！"; +"XPCandyTreeViewController2" = "购买锤子数量不能为0！"; "XPCandyTreeViewController4" = "去参与"; "XPCandyTreeViewController5" = "一次只能选择99999次"; "XPCandyTreeViewController7" = "排行榜"; @@ -1401,7 +1401,7 @@ "XPRoomMessageParser74" = "关闭了"; "XPRoomMessageParser75" = "%d麦"; "XPRoomMessageParser76" = "自由麦"; -"XPRoomMessageParser77" = "厉害了！%@通过寻爱之旅获取%@%@"; +"XPRoomMessageParser77" = "厉害了！%@通过欢乐砸蛋获取%@%@"; "XPRoomMessageParser79" = "(仅自己可见)"; "XPRoomMessageParser80" = "VIP降临！恭喜"; "XPRoomMessageParser81" = "开通VIP系统，获得"; @@ -1600,7 +1600,7 @@ "XPRoomNobleLevelUpView0" = "引爆全场！恭喜 "; "XPRoomNobleLevelUpView1" = "VIP身份升级为%@!"; -"XPRoomCandyGiftView0" = "厉害了！%@通过寻爱之旅获取%@%@"; +"XPRoomCandyGiftView0" = "厉害了！%@通过欢乐砸蛋获取%@%@"; @@ -2695,6 +2695,7 @@ "XPNobleCenterEntranceView0" = "距升级还差%@权力值"; "XPNobleCenterEntranceView1" = "VIP中心"; "XPNobleCenterEntranceView2" = "开通立享各项特权"; +"XPNobleCenterEntranceView3" = "当前已是最高等级"; ///XPNobleCenterPayView "XPNobleCenterPayView0" = "支付"; "XPNobleCenterPayView1" = "金币"; @@ -3070,10 +3071,10 @@ "PITreasureFairyBuyElfShardView3"="充值成功"; ///XPCandyTreeConfirmBuyView -"XPCandyTreeConfirmBuyView0"="可用爱心不足，请购买"; -"XPCandyTreeConfirmBuyView1"="购买%@个爱心"; +"XPCandyTreeConfirmBuyView0"="可用锤子不足，请购买"; +"XPCandyTreeConfirmBuyView1"="购买%@个锤子"; ///XPCandyTreeBuyView -"XPCandyTreeBuyView0"="请选择或输入购买的爱心数量"; +"XPCandyTreeBuyView0"="请选择或输入购买的锤子数量"; ///PIMessageContentServiceReplyView "PIMessageContentServiceReplyView0"="如何储值："; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index b4cf8c79..affa3e33 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -24,7 +24,7 @@ ///XPCandyTreeViewController.m -"XPCandyTreeViewController2" = "購買愛心數量不能為0！"; +"XPCandyTreeViewController2" = "購買錘子數量不能為0！"; "XPCandyTreeViewController4" = "去參與"; "XPCandyTreeViewController5" = "一次只能選擇99999次"; "XPCandyTreeViewController7" = "排行榜"; @@ -1404,7 +1404,7 @@ "XPRoomMessageParser74" = "關閉了"; "XPRoomMessageParser75" = "%d麥"; "XPRoomMessageParser76" = "自由麥"; -"XPRoomMessageParser77" = "厲害了！%@通過尋愛之旅獲取%@%@"; +"XPRoomMessageParser77" = "厲害了！%@通過歡樂砸蛋獲取%@%@"; "XPRoomMessageParser79" = "(僅自己可見)"; "XPRoomMessageParser80" = "VIP降臨！恭喜"; "XPRoomMessageParser81" = "開通VIP系統，獲得"; @@ -1601,7 +1601,7 @@ "XPRoomNobleLevelUpView0" = "引爆全場！恭喜 "; "XPRoomNobleLevelUpView1" = "VIP身份升級為%@!"; -"XPRoomCandyGiftView0" = "厲害了！%@通過尋愛之旅獲取%@%@"; +"XPRoomCandyGiftView0" = "厲害了！%@通過歡樂砸蛋獲取%@%@"; @@ -2685,6 +2685,7 @@ "XPNobleCenterEntranceView0" = "距升級還差%@權力值"; "XPNobleCenterEntranceView1" = "VIP中心"; "XPNobleCenterEntranceView2" = "開通立享各項特權"; +"XPNobleCenterEntranceView3" = "當前已是最高等級"; ///XPNobleCenterPayView "XPNobleCenterPayView0" = "支付"; "XPNobleCenterPayView1" = "金幣"; @@ -3060,10 +3061,10 @@ "PITreasureFairyBuyElfShardView3"="充值成功"; ///XPCandyTreeConfirmBuyView -"XPCandyTreeConfirmBuyView0"="可用愛心不足，請購買"; -"XPCandyTreeConfirmBuyView1"="購買%@個愛心"; +"XPCandyTreeConfirmBuyView0"="可用錘子不足，請購買"; +"XPCandyTreeConfirmBuyView1"="購買%@個錘子"; ///XPCandyTreeBuyView -"XPCandyTreeBuyView0"="請選擇或輸入購買的愛心數量"; +"XPCandyTreeBuyView0"="請選擇或輸入購買的錘子數量"; ///PIMessageContentServiceReplyView "PIMessageContentServiceReplyView0"="如何儲值：";