From cfd4111b245482db41a40befe3db10b04c764e50 Mon Sep 17 00:00:00 2001 From: liyuhua <15626451870@163.com> Date: Wed, 24 Apr 2024 20:08:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Podfile | 15 +- YuMi.xcodeproj/project.pbxproj | 16 +- YuMi/Appdelegate/AppDelegate.m | 2 +- .../Contents.json | 2 +- .../YearActivity_goto_ar.png | Bin 0 -> 4810 bytes .../Contents.json | 3 +- .../anchor_hour_rank_icon_ar.png | Bin 0 -> 14653 bytes .../common_new_user_ar.imageset/Contents.json | 21 ++ .../common_new_user_ar.png | Bin 0 -> 3650 bytes .../gift_tag_latest_ar.imageset/Contents.json | 21 ++ .../gift_tag_latest_ar.png | Bin 0 -> 3977 bytes .../Contents.json | 21 ++ .../gift_twelve_star_Banner_naming_bg_ar.png | Bin 0 -> 98089 bytes .../Contents.json | 21 ++ .../gift_twelve_star_Banner_rich_bg_ar.png | Bin 0 -> 94359 bytes .../Contents.json | 21 ++ .../mine_info_recharge_ar.png | Bin 0 -> 7917 bytes .../Contents.json | 22 ++ .../mine_noble_center_rank_ar@2x.png | Bin 0 -> 3610 bytes .../mine_noble_center_rank_ar@3x.png | Bin 0 -> 6160 bytes .../Contents.json | 22 ++ .../mine_noble_center_tag_title_bg_ar@2x.png | Bin 0 -> 2224 bytes .../mine_noble_center_tag_title_bg_ar@3x.png | Bin 0 -> 3678 bytes .../Contents.json | 21 ++ .../noble_myLevel_head_ar@3x.png | Bin 0 -> 9321 bytes .../Contents.json | 21 ++ .../pi_webView_code_top_text_ar.png | Bin 0 -> 37844 bytes .../Contents.json | 21 ++ .../room_gift_super_gift_icon_ar@3x.png | Bin 0 -> 5617 bytes .../Contents.json | 0 .../room_little_game_normal_room_selec_ar.png | Bin .../Contents.json | 3 +- .../mine_noble_center_rank_en.png | Bin 23925 -> 0 bytes .../mine_noble_center_rank_en@2x.png | Bin 0 -> 11580 bytes .../mine_noble_center_rank_en@3x.png | Bin 0 -> 24781 bytes .../Contents.json | 3 +- .../mine_noble_center_tag_title_bg_en.png | Bin 9044 -> 0 bytes .../mine_noble_center_tag_title_bg_en@2x.png | Bin 0 -> 1980 bytes .../mine_noble_center_tag_title_bg_en@3x.png | Bin 0 -> 3094 bytes .../Contents.json | 21 ++ .../pi_webView_code_top_text_en.png | Bin 0 -> 39512 bytes .../room_candy_tree_confirm_buy_title_en.png | Bin 33679 -> 0 bytes .../mine_noble_center_rank@2x.png | Bin 3197 -> 3153 bytes .../mine_noble_center_rank@3x.png | Bin 5244 -> 5211 bytes .../mine_noble_center_tag_title_bg@2x.png | Bin 2072 -> 4439 bytes .../mine_noble_center_tag_title_bg@3x.png | Bin 3232 -> 9720 bytes .../Contents.json | 3 +- .../pi_webView_code_top_text.png | Bin 0 -> 30087 bytes .../pi_webView_code_top_text@2x.png | Bin 3700 -> 0 bytes .../pi_webView_code_top_text@3x.png | Bin 6015 -> 0 bytes .../Contents.json | 22 ++ .../ms_joyful_egg_smash_rank_bg@2x.png | Bin 0 -> 60204 bytes .../ms_joyful_egg_smash_rank_bg@3x.png | Bin 0 -> 133751 bytes .../Contents.json | 22 ++ .../ms_joyful_egg_smash_rank_btn_bg@2x.png | Bin 0 -> 2009 bytes .../ms_joyful_egg_smash_rank_btn_bg@3x.png | Bin 0 -> 3542 bytes .../Contents.json | 22 ++ .../ms_joyful_egg_smash_rank_btn_today@2x.png | Bin 0 -> 2060 bytes .../ms_joyful_egg_smash_rank_btn_today@3x.png | Bin 0 -> 4296 bytes .../Contents.json | 22 ++ ...joyful_egg_smash_rank_btn_yesterday@2x.png | Bin 0 -> 2045 bytes ...joyful_egg_smash_rank_btn_yesterday@3x.png | Bin 0 -> 4412 bytes .../room_candy_tree_buy_bg@2x.png | Bin 1232 -> 1252 bytes .../room_candy_tree_buy_bg@3x.png | Bin 2372 -> 2405 bytes .../room_candy_tree_buy_icon@2x.png | Bin 2560 -> 2312 bytes .../room_candy_tree_buy_icon@3x.png | Bin 3856 -> 3252 bytes .../Contents.json | 4 +- .../room_candy_tree_buy_love__bg@2x.png | Bin 7091 -> 0 bytes .../room_candy_tree_buy_love__bg@3x.png | Bin 16397 -> 0 bytes .../room_candy_tree_buy_love_bg@2x.png | Bin 0 -> 9250 bytes .../room_candy_tree_buy_love_bg@3x.png | Bin 0 -> 15820 bytes .../room_candy_tree_buy_love_but_btn@2x.png | Bin 2162 -> 3543 bytes .../room_candy_tree_buy_love_but_btn@3x.png | Bin 4660 -> 7611 bytes .../room_candy_tree_buy_love_close@2x.png | Bin 985 -> 854 bytes .../room_candy_tree_buy_love_close@3x.png | Bin 1905 -> 1536 bytes .../room_candy_tree_buy_love_icon@2x.png | Bin 9483 -> 4685 bytes .../room_candy_tree_buy_love_icon@3x.png | Bin 19016 -> 7852 bytes .../Contents.json | 22 ++ .../room_candy_tree_buy_love_icon_bg@2x.png | Bin 0 -> 9328 bytes .../room_candy_tree_buy_love_icon_bg@3x.png | Bin 0 -> 21872 bytes .../room_candy_tree_buy_tap_bg@2x.png | Bin 1297 -> 1691 bytes .../room_candy_tree_buy_tap_bg@3x.png | Bin 2766 -> 3090 bytes .../room_candy_tree_confirm_buy_bg@2x.png | Bin 7812 -> 30499 bytes .../room_candy_tree_confirm_buy_bg@3x.png | Bin 18362 -> 66026 bytes .../room_candy_tree_confirm_buy_title@2x.png | Bin 5521 -> 0 bytes .../room_candy_tree_confirm_buy_title@3x.png | Bin 9530 -> 0 bytes .../Contents.json | 22 ++ .../room_candytree_large_big_gift_bg@2x.png | Bin 0 -> 27173 bytes .../room_candytree_large_big_gift_bg@3x.png | Bin 0 -> 53709 bytes .../room_candytree_large_gift_bg@2x.png | Bin 19269 -> 23594 bytes .../room_candytree_large_gift_bg@3x.png | Bin 37037 -> 46773 bytes .../room_candytree_wish_num1@2x.png | Bin 1054 -> 1014 bytes .../room_candytree_wish_num1@3x.png | Bin 1830 -> 1829 bytes .../room_candytree_wish_num2@2x.png | Bin 999 -> 1169 bytes .../room_candytree_wish_num2@3x.png | Bin 1689 -> 2147 bytes .../room_candytree_wish_num3@2x.png | Bin 1068 -> 1149 bytes .../room_candytree_wish_num3@3x.png | Bin 1818 -> 1996 bytes YuMi/CustomUI/MSRTL/UILabel+MSRTL.m | 34 ++- YuMi/CustomUI/UIImageView/NetImageView.m | 1 + YuMi/Global/YUMIConstant.h | 3 +- YuMi/Global/YUMIConstant.m | 19 +- YuMi/Global/YUMIMacroUitls.h | 3 +- .../View/NewLogin/XPLoginViewController.m | 28 +- .../Content/MessageContentTextClickable.m | 18 +- .../View/SubViews/PINobleCenterListCell.h | 1 + .../View/SubViews/PINobleCenterListCell.m | 4 +- .../View/SubViews/PINobleCenterListView.m | 16 +- .../View/SubViews/PINobleCenterTitleCell.m | 10 +- .../View/SubViews/XPNobleCenterEntranceView.m | 10 +- .../View/SubViews/XPNoblePrivilegeCell.m | 11 +- .../SubViews/XPNoblePrivilegeContentCell.m | 7 +- .../View/XPNobleCenterListViewController.m | 2 +- .../Noble/View/XPNobleCenterViewController.m | 12 +- .../YMMine/View/PISwitchingEnvironmentVC.m | 2 +- .../Setting/XPMineSettingViewController.m | 2 +- .../MineInfo/XPMineUserInfoHeaderView.m | 6 +- .../YMMine/View/XPMineViewController.m | 39 +-- .../Presenter/XPHomeContainerPresenter.h | 2 +- .../Presenter/XPHomeContainerPresenter.m | 43 +++ .../Protocol/XPHomeContainerProtocol.h | 1 + .../Cell/XPNewHomePartyCollectionViewCell.m | 34 ++- .../View/CustomView/XPNewHomeHeadView.m | 10 + .../YMNewHome/View/XPNewHomeViewController.m | 20 +- .../XPRoomActivityContainerView.m | 2 +- .../View/SubViews/XPAnchorPkPanelView.m | 7 +- .../AnimationView/PIUniversalBannerView.m | 17 +- .../View/AnimationView/XPRoomAnimationView.m | 12 +- .../View/AnimationView/XPRoomCandyGiftView.m | 33 +-- .../AnimationView/XPRoomLuckyBigPrizeView.m | 3 + .../View/Cell/XPCandyTreeRankTableViewCell.m | 37 +-- .../CandyTree/View/XPCandyRankContainerView.m | 187 +++++++------ .../View/XPCandyTreeBuySuccessView.m | 37 ++- .../View/CandyTree/View/XPCandyTreeBuyView.m | 9 +- .../View/XPCandyTreeConfirmBuyNumView.m | 18 +- .../View/XPCandyTreeConfirmBuyView.m | 78 +++--- .../View/CandyTree/View/XPCandyTreeGiftView.m | 2 +- .../View/CandyTree/View/XPCandyTreeRankView.m | 2 +- .../View/XPCandyTreeViewController.m | 255 ++++++------------ .../XPRoomMenuContainerView.m | 10 +- .../Model/XPMessageInfoModel.h | 1 + .../Model/XPMessageInfoModel.m | 1 + .../Tool/XPRoomMessageParser.m | 6 +- .../View/XPGiftLuckyGiftBroadcastView.m | 4 +- .../View/XPGiftTwelveStarBroadcastView.m | 12 +- .../Setting/View/XPRoomTopicViewController.m | 1 + .../UserCard/View/XPUserCardViewController.m | 6 +- .../YMRoom/View/XPRoomViewController.m | 4 + .../View/PIFullScreenBannerAnimation.m | 6 +- .../YMTabbar/View/TabbarViewController.m | 14 +- YuMi/Modules/YMWeb/PIWebViewSavePhotoView.m | 2 +- YuMi/Network/HttpRequestHelper.m | 23 +- YuMi/Network/MSParamsDecode.h | 21 ++ YuMi/Network/MSParamsDecode.m | 65 +++++ YuMi/Resources/pi_happy_egg_smash.svga | Bin 0 -> 14530 bytes YuMi/Structure/MVP/Model/UserInfoModel.h | 2 +- YuMi/Tools/YYUtility/YYUtility+App.m | 13 +- YuMi/ar.lproj/Localizable.strings | 17 +- YuMi/en.lproj/Localizable.strings | 24 +- YuMi/zh-Hans.lproj/Localizable.strings | 13 +- YuMi/zh-Hant.lproj/Localizable.strings | 13 +- 160 files changed, 1140 insertions(+), 571 deletions(-) rename YuMi/Assets.xcassets/Language/{en/room_candy_tree_confirm_buy_title_en.imageset => ar/YearActivity_goto_ar.imageset}/Contents.json (81%) create mode 100644 YuMi/Assets.xcassets/Language/ar/YearActivity_goto_ar.imageset/YearActivity_goto_ar.png rename YuMi/Assets.xcassets/{yna/CandyTree/room_candy_tree_confirm_buy_title.imageset => Language/ar/anchor_hour_rank_icon_ar.imageset}/Contents.json (68%) create mode 100644 YuMi/Assets.xcassets/Language/ar/anchor_hour_rank_icon_ar.imageset/anchor_hour_rank_icon_ar.png create mode 100644 YuMi/Assets.xcassets/Language/ar/common_new_user_ar.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/Language/ar/common_new_user_ar.imageset/common_new_user_ar.png create mode 100644 YuMi/Assets.xcassets/Language/ar/gift_tag_latest_ar.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/Language/ar/gift_tag_latest_ar.imageset/gift_tag_latest_ar.png create mode 100644 YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_naming_bg_ar.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_naming_bg_ar.imageset/gift_twelve_star_Banner_naming_bg_ar.png create mode 100644 YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_rich_bg_ar.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/Language/ar/gift_twelve_star_Banner_rich_bg_ar.imageset/gift_twelve_star_Banner_rich_bg_ar.png create mode 100644 YuMi/Assets.xcassets/Language/ar/mine_info_recharge_ar.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/Language/ar/mine_info_recharge_ar.imageset/mine_info_recharge_ar.png create mode 100644 YuMi/Assets.xcassets/Language/ar/mine_noble_center_rank_ar.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/Language/ar/mine_noble_center_rank_ar.imageset/mine_noble_center_rank_ar@2x.png create mode 100644 YuMi/Assets.xcassets/Language/ar/mine_noble_center_rank_ar.imageset/mine_noble_center_rank_ar@3x.png create mode 100644 YuMi/Assets.xcassets/Language/ar/mine_noble_center_tag_title_bg_ar.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/Language/ar/mine_noble_center_tag_title_bg_ar.imageset/mine_noble_center_tag_title_bg_ar@2x.png create mode 100644 YuMi/Assets.xcassets/Language/ar/mine_noble_center_tag_title_bg_ar.imageset/mine_noble_center_tag_title_bg_ar@3x.png create mode 100644 YuMi/Assets.xcassets/Language/ar/noble_myLevel_head_ar.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/Language/ar/noble_myLevel_head_ar.imageset/noble_myLevel_head_ar@3x.png create mode 100644 YuMi/Assets.xcassets/Language/ar/pi_webView_code_top_text_ar.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/Language/ar/pi_webView_code_top_text_ar.imageset/pi_webView_code_top_text_ar.png create mode 100644 YuMi/Assets.xcassets/Language/ar/room_gift_super_gift_icon_ar.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/Language/ar/room_gift_super_gift_icon_ar.imageset/room_gift_super_gift_icon_ar@3x.png rename YuMi/Assets.xcassets/Language/ar/{room_little_game_normal_room_selec_ar.imageset => room_little_game_normal_room_select_ar.imageset}/Contents.json (100%) rename YuMi/Assets.xcassets/Language/ar/{room_little_game_normal_room_selec_ar.imageset => room_little_game_normal_room_select_ar.imageset}/room_little_game_normal_room_selec_ar.png (100%) delete mode 100644 YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/mine_noble_center_rank_en.png create mode 100644 YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/mine_noble_center_rank_en@2x.png create mode 100644 YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/mine_noble_center_rank_en@3x.png delete mode 100644 YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/mine_noble_center_tag_title_bg_en.png create mode 100644 YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/mine_noble_center_tag_title_bg_en@2x.png create mode 100644 YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/mine_noble_center_tag_title_bg_en@3x.png create mode 100644 YuMi/Assets.xcassets/Language/en/pi_webView_code_top_text_en.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/Language/en/pi_webView_code_top_text_en.imageset/pi_webView_code_top_text_en.png delete mode 100644 YuMi/Assets.xcassets/Language/en/room_candy_tree_confirm_buy_title_en.imageset/room_candy_tree_confirm_buy_title_en.png create mode 100644 YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/pi_webView_code_top_text.png delete mode 100644 YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/pi_webView_code_top_text@2x.png delete mode 100644 YuMi/Assets.xcassets/webView/pi_webView_code_top_text.imageset/pi_webView_code_top_text@3x.png create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_bg.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_bg.imageset/ms_joyful_egg_smash_rank_bg@2x.png create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_bg.imageset/ms_joyful_egg_smash_rank_bg@3x.png create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_bg.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_bg.imageset/ms_joyful_egg_smash_rank_btn_bg@2x.png create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_bg.imageset/ms_joyful_egg_smash_rank_btn_bg@3x.png create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_today.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_today.imageset/ms_joyful_egg_smash_rank_btn_today@2x.png create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_today.imageset/ms_joyful_egg_smash_rank_btn_today@3x.png create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_yesterday.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_yesterday.imageset/ms_joyful_egg_smash_rank_btn_yesterday@2x.png create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/ms_joyful_egg_smash_rank_btn_yesterday.imageset/ms_joyful_egg_smash_rank_btn_yesterday@3x.png delete mode 100644 YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love__bg@2x.png delete mode 100644 YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love__bg@3x.png create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love_bg@2x.png create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love__bg.imageset/room_candy_tree_buy_love_bg@3x.png create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon_bg.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon_bg.imageset/room_candy_tree_buy_love_icon_bg@2x.png create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_buy_love_icon_bg.imageset/room_candy_tree_buy_love_icon_bg@3x.png delete mode 100644 YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_title.imageset/room_candy_tree_confirm_buy_title@2x.png delete mode 100644 YuMi/Assets.xcassets/yna/CandyTree/room_candy_tree_confirm_buy_title.imageset/room_candy_tree_confirm_buy_title@3x.png create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_big_gift_bg.imageset/Contents.json create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_big_gift_bg.imageset/room_candytree_large_big_gift_bg@2x.png create mode 100644 YuMi/Assets.xcassets/yna/CandyTree/room_candytree_large_big_gift_bg.imageset/room_candytree_large_big_gift_bg@3x.png create mode 100644 YuMi/Network/MSParamsDecode.h create mode 100644 YuMi/Network/MSParamsDecode.m create mode 100644 YuMi/Resources/pi_happy_egg_smash.svga 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 0000000000000000000000000000000000000000..b4aeb2560c69a0d591a188f229837850e6e1a30f GIT binary patch literal 4810 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..60f107edf4f8f3c3a7fe5b06ef558b1ca703634a GIT binary patch literal 14653 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