diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 54817d48..f51f723a 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -253,6 +253,14 @@ 237700E62BC7E81F00D661F1 /* UITextField+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700E52BC7E81F00D661F1 /* UITextField+MSRTL.m */; }; 237700E92BC7E88E00D661F1 /* UITextView+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700E82BC7E88E00D661F1 /* UITextView+MSRTL.m */; }; 237700EC2BC914B400D661F1 /* UISwipeGestureRecognizer+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700EB2BC914B400D661F1 /* UISwipeGestureRecognizer+MSRTL.m */; }; + 237700FA2BCCD25500D661F1 /* YYLabel+MSRTL.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700F92BCCD25500D661F1 /* YYLabel+MSRTL.m */; }; + 237700FD2BCD254000D661F1 /* MSBaseTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 237700FC2BCD254000D661F1 /* MSBaseTextField.m */; }; + 237701082BCF73CE00D661F1 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 237701072BCF73CE00D661F1 /* Security.framework */; }; + 2377010A2BCF73DD00D661F1 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 237701092BCF73DD00D661F1 /* libiconv.tbd */; }; + 2377010C2BCF73EA00D661F1 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2377010B2BCF73EA00D661F1 /* SystemConfiguration.framework */; }; + 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 */; }; 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 */; }; @@ -445,7 +453,6 @@ 23FF25792ABD67CD0064E904 /* XPFreeGiftModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF25772ABD67CD0064E904 /* XPFreeGiftModel.m */; }; 23FF257C2ABD68020064E904 /* XPGiftFreeItemCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF257B2ABD68020064E904 /* XPGiftFreeItemCell.m */; }; 23FF42632AA5861E0055733C /* XPNewHomePartyCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF42622AA5861E0055733C /* XPNewHomePartyCollectionViewCell.m */; }; - 23FF42652AA5AC040055733C /* home_heat.gif in Resources */ = {isa = PBXBuildFile; fileRef = 23FF42642AA5AC040055733C /* home_heat.gif */; }; 23FF42672AA5CFBB0055733C /* home_sound_wave.gif in Resources */ = {isa = PBXBuildFile; fileRef = 23FF42662AA5CFBB0055733C /* home_sound_wave.gif */; }; 23FF426A2AA5DF050055733C /* XPNewHomePartyTagView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF42692AA5DF050055733C /* XPNewHomePartyTagView.m */; }; 23FF426D2AA5E4EE0055733C /* XPNewHomePartyAudioView.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FF426C2AA5E4EE0055733C /* XPNewHomePartyAudioView.m */; }; @@ -561,8 +568,6 @@ 9BD63FAB277EE885006EB744 /* Api+RoomRadio.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD63FAA277EE885006EB744 /* Api+RoomRadio.m */; }; 9BD63FAE277EE97A006EB744 /* XPReleaseRadioPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD63FAD277EE97A006EB744 /* XPReleaseRadioPresenter.m */; }; 9BD63FB4277EF1B3006EB744 /* XPReleaseRadioModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD63FB3277EF1B3006EB744 /* XPReleaseRadioModel.m */; }; - 9BD798B129262434003E03E6 /* XPSessionListHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD798B029262434003E03E6 /* XPSessionListHeadView.m */; }; - 9BD798B4292632FE003E03E6 /* XPSessionListHeadItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD798B3292632FE003E03E6 /* XPSessionListHeadItemView.m */; }; 9BD798B72926362F003E03E6 /* XPSessionListHeadItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD798B62926362F003E03E6 /* XPSessionListHeadItem.m */; }; 9BD8D4E328911E9900AE03FF /* XPMineCollectRoomListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD8D4E228911E9900AE03FF /* XPMineCollectRoomListViewController.m */; }; 9BD8D4E628911F7700AE03FF /* XPMineCollectRoomListPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = 9BD8D4E528911F7700AE03FF /* XPMineCollectRoomListPresenter.m */; }; @@ -1992,6 +1997,16 @@ 237700E82BC7E88E00D661F1 /* UITextView+MSRTL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UITextView+MSRTL.m"; sourceTree = ""; }; 237700EA2BC914B400D661F1 /* UISwipeGestureRecognizer+MSRTL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UISwipeGestureRecognizer+MSRTL.h"; sourceTree = ""; }; 237700EB2BC914B400D661F1 /* UISwipeGestureRecognizer+MSRTL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UISwipeGestureRecognizer+MSRTL.m"; sourceTree = ""; }; + 237700F82BCCD25500D661F1 /* YYLabel+MSRTL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YYLabel+MSRTL.h"; sourceTree = ""; }; + 237700F92BCCD25500D661F1 /* YYLabel+MSRTL.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "YYLabel+MSRTL.m"; sourceTree = ""; }; + 237700FB2BCD254000D661F1 /* MSBaseTextField.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSBaseTextField.h; sourceTree = ""; }; + 237700FC2BCD254000D661F1 /* MSBaseTextField.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSBaseTextField.m; sourceTree = ""; }; + 237701072BCF73CE00D661F1 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + 237701092BCF73DD00D661F1 /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; }; + 2377010B2BCF73EA00D661F1 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; + 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; }; 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 = ""; }; @@ -2362,7 +2377,6 @@ 23FF257B2ABD68020064E904 /* XPGiftFreeItemCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XPGiftFreeItemCell.m; sourceTree = ""; }; 23FF42612AA5861E0055733C /* XPNewHomePartyCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomePartyCollectionViewCell.h; sourceTree = ""; }; 23FF42622AA5861E0055733C /* XPNewHomePartyCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomePartyCollectionViewCell.m; sourceTree = ""; }; - 23FF42642AA5AC040055733C /* home_heat.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = home_heat.gif; sourceTree = ""; }; 23FF42662AA5CFBB0055733C /* home_sound_wave.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = home_sound_wave.gif; sourceTree = ""; }; 23FF42682AA5DF050055733C /* XPNewHomePartyTagView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPNewHomePartyTagView.h; sourceTree = ""; }; 23FF42692AA5DF050055733C /* XPNewHomePartyTagView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPNewHomePartyTagView.m; sourceTree = ""; }; @@ -2594,10 +2608,6 @@ 9BD63FB1277EF14A006EB744 /* XPReleaseRadioProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPReleaseRadioProtocol.h; sourceTree = ""; }; 9BD63FB2277EF1B3006EB744 /* XPReleaseRadioModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPReleaseRadioModel.h; sourceTree = ""; }; 9BD63FB3277EF1B3006EB744 /* XPReleaseRadioModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPReleaseRadioModel.m; sourceTree = ""; }; - 9BD798AF29262434003E03E6 /* XPSessionListHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionListHeadView.h; sourceTree = ""; }; - 9BD798B029262434003E03E6 /* XPSessionListHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionListHeadView.m; sourceTree = ""; }; - 9BD798B2292632FE003E03E6 /* XPSessionListHeadItemView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionListHeadItemView.h; sourceTree = ""; }; - 9BD798B3292632FE003E03E6 /* XPSessionListHeadItemView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionListHeadItemView.m; sourceTree = ""; }; 9BD798B52926362F003E03E6 /* XPSessionListHeadItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPSessionListHeadItem.h; sourceTree = ""; }; 9BD798B62926362F003E03E6 /* XPSessionListHeadItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPSessionListHeadItem.m; sourceTree = ""; }; 9BD8D4E128911E9900AE03FF /* XPMineCollectRoomListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineCollectRoomListViewController.h; sourceTree = ""; }; @@ -4297,7 +4307,13 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 237701122BCF742C00D661F1 /* libz.tbd in Frameworks */, 23E56B3C2B03564B00C8DAC9 /* CoreTelephony.framework in Frameworks */, + 237701102BCF740400D661F1 /* libsqlite3.tbd in Frameworks */, + 2377010E2BCF73F400D661F1 /* CoreGraphics.framework in Frameworks */, + 2377010C2BCF73EA00D661F1 /* SystemConfiguration.framework in Frameworks */, + 2377010A2BCF73DD00D661F1 /* libiconv.tbd in Frameworks */, + 237701082BCF73CE00D661F1 /* Security.framework in Frameworks */, 234489082AC3C5DA0070E5D5 /* SudMGP.framework in Frameworks */, 73FFADDC93E195344047A2EC /* Pods_YuMi.framework in Frameworks */, 186A531926FC592100D67B2C /* libresolv.tbd in Frameworks */, @@ -5589,6 +5605,8 @@ 237700D62BC7D51400D661F1 /* UIButton+MSRTL.m */, 237700D82BC7D5EC00D661F1 /* UILabel+MSRTL.h */, 237700D92BC7D5EC00D661F1 /* UILabel+MSRTL.m */, + 237700F82BCCD25500D661F1 /* YYLabel+MSRTL.h */, + 237700F92BCCD25500D661F1 /* YYLabel+MSRTL.m */, 237700DB2BC7D70E00D661F1 /* UIImage+MSRTL.h */, 237700DC2BC7D70E00D661F1 /* UIImage+MSRTL.m */, 237700DE2BC7D78600D661F1 /* MSBaseRTLFlowLayout.h */, @@ -5597,6 +5615,8 @@ 237700E22BC7D7C000D661F1 /* NSMutableAttributedString+MSRTL.m */, 237700E42BC7E81F00D661F1 /* UITextField+MSRTL.h */, 237700E52BC7E81F00D661F1 /* UITextField+MSRTL.m */, + 237700FB2BCD254000D661F1 /* MSBaseTextField.h */, + 237700FC2BCD254000D661F1 /* MSBaseTextField.m */, 237700E72BC7E88E00D661F1 /* UITextView+MSRTL.h */, 237700E82BC7E88E00D661F1 /* UITextView+MSRTL.m */, 237700EA2BC914B400D661F1 /* UISwipeGestureRecognizer+MSRTL.h */, @@ -6567,10 +6587,6 @@ isa = PBXGroup; children = ( 9B4C5B83292F81D000CEA41B /* Model */, - 9BD798AF29262434003E03E6 /* XPSessionListHeadView.h */, - 9BD798B029262434003E03E6 /* XPSessionListHeadView.m */, - 9BD798B2292632FE003E03E6 /* XPSessionListHeadItemView.h */, - 9BD798B3292632FE003E03E6 /* XPSessionListHeadItemView.m */, 9BD798B52926362F003E03E6 /* XPSessionListHeadItem.h */, 9BD798B62926362F003E03E6 /* XPSessionListHeadItem.m */, 9B87B3CB2926473D00085110 /* XPSessionListHeadFriendCell.h */, @@ -6716,6 +6732,12 @@ BFB922F5D81845AC32D1E1ED /* Frameworks */ = { isa = PBXGroup; children = ( + 237701112BCF742C00D661F1 /* libz.tbd */, + 2377010F2BCF740400D661F1 /* libsqlite3.tbd */, + 2377010D2BCF73F400D661F1 /* CoreGraphics.framework */, + 2377010B2BCF73EA00D661F1 /* SystemConfiguration.framework */, + 237701092BCF73DD00D661F1 /* libiconv.tbd */, + 237701072BCF73CE00D661F1 /* Security.framework */, 23E56B3B2B03564B00C8DAC9 /* CoreTelephony.framework */, E87888F32738C30E00BF1D57 /* StoreKit.framework */, 186A531826FC591100D67B2C /* libresolv.tbd */, @@ -9532,7 +9554,6 @@ 23FF256F2ABD456C0064E904 /* pi_home_new_play.svga */, 23FF25612ABAE6310064E904 /* pi_room_game_fine_love.svga */, 232C444A2AB4363200D4B2ED /* pi_room_tarrow_h5_banner.svga */, - 23FF42642AA5AC040055733C /* home_heat.gif */, 23FF42662AA5CFBB0055733C /* home_sound_wave.gif */, 23E9EB232A84E98300B792F2 /* pi_new_mine_info_online.svga */, 23FF255A2AB956D50064E904 /* pi_home_new_pk.svga */, @@ -10751,7 +10772,6 @@ E80EC89F28ACD84000D133C5 /* emoji_66@2x.png in Resources */, E80EC87128ACD84000D133C5 /* emoji_160@2x.png in Resources */, 23E9EB252A84E98300B792F2 /* pi_new_mine_info_online.svga in Resources */, - 23FF42652AA5AC040055733C /* home_heat.gif in Resources */, 2368ECEB2BC5280300EDF4C9 /* upload.html in Resources */, 23A03F2D2B4408CD0094227A /* pi_room_lucky_gift.svga in Resources */, E80EC86D28ACD84000D133C5 /* emoji_35@2x.png in Resources */, @@ -11116,6 +11136,7 @@ E8C1CD7327D8A16500376F83 /* XPRoomFaceTool.m in Sources */, 236B2E462AA07D06003967A8 /* UIImage+RW.m in Sources */, E81DCCCD282B63B40039E5C5 /* XPMonentsViewController.m in Sources */, + 237700FD2BCD254000D661F1 /* MSBaseTextField.m in Sources */, 237700E62BC7E81F00D661F1 /* UITextField+MSRTL.m in Sources */, E86507EB281A88A9006951B0 /* MessageContentSkillCardView.m in Sources */, E8B825CA26EA1231009E8E9F /* LoginVerifCodeViewController.m in Sources */, @@ -11453,6 +11474,7 @@ 238B37CA2AC55A2C00BFC9D5 /* XPTreasureFairyPrizePoolView.m in Sources */, E81060FD2987CC9100B772F0 /* MessageLevelUpgradeModel.m in Sources */, 2305EF0D2AD7CC9A00AD403C /* PIRoomPhotoAlbumChooseGiftCell.m in Sources */, + 237700FA2BCCD25500D661F1 /* YYLabel+MSRTL.m in Sources */, E84BF7DD277C765400EF8877 /* XPRoomRoleEmptyTableViewCell.m in Sources */, E8F6135C291E26BD00E12650 /* NSMutableDictionary+Saft.m in Sources */, 1427213429A75A2600C7C423 /* XPMonentsLatestPresenter.m in Sources */, @@ -11732,7 +11754,6 @@ E86507E5281A7D4D006951B0 /* MessageContentTweetView.m in Sources */, E824544B26F5BBB800BE8163 /* XPMineModifPayPwdViewController.m in Sources */, E81C1B2227705F950020D1E4 /* Api+ArrangeMic.m in Sources */, - 9BD798B4292632FE003E03E6 /* XPSessionListHeadItemView.m in Sources */, E8E20BE828169BDC0033B688 /* XPMineLoginPasswordPresenter.m in Sources */, 238B37D52AC55A2C00BFC9D5 /* PITreasureFairyBuyElfShardView.m in Sources */, E85E7B3F2A4EB0D300B6D00A /* XPGuildSingleRoomIncomeTableViewCell.m in Sources */, @@ -11765,7 +11786,6 @@ E8B9842D28AB77F10022D026 /* XPMonentsPublishTopicView.m in Sources */, 239141C62AE129F700322CA9 /* PIInputScrollingView.m in Sources */, E88C72992828F3620047FB2B /* XPRoomMusicLibraryTableViewCell.m in Sources */, - 9BD798B129262434003E03E6 /* XPSessionListHeadView.m in Sources */, E8D34D4728080295009C4835 /* XPMineUserDataViewController.m in Sources */, E801275127E3281100BAC3F2 /* XPRoomPKTimeTableViewCell.m in Sources */, E8EEB90F26FC6AB8007C6EBA /* XPMineUserInfoEditPresenter.m in Sources */, @@ -12348,6 +12368,8 @@ "$(PROJECT_DIR)/YuMi/Modules/YMRTC/Library", "$(PROJECT_DIR)/YuMi/Resources/Client", "$(PROJECT_DIR)/YuMi/Library", + "$(PROJECT_DIR)/YuMi/Tools", + "$(PROJECT_DIR)/YuMi/Tools/TencentOpenApiSDK", ); GCC_PREFIX_HEADER = YuMi/Structure/PrefixHeader.pch; INFOPLIST_FILE = YuMi/Info.plist; @@ -12384,6 +12406,8 @@ "$(PROJECT_DIR)/YuMi/Modules/YMRTC/Library", "$(PROJECT_DIR)/YuMi/Resources/Client", "$(PROJECT_DIR)/YuMi/Library", + "$(PROJECT_DIR)/YuMi/Tools", + "$(PROJECT_DIR)/YuMi/Tools/TencentOpenApiSDK", ); GCC_PREFIX_HEADER = YuMi/Structure/PrefixHeader.pch; INFOPLIST_FILE = YuMi/Info.plist; diff --git a/YuMi/Assets.xcassets/low/newhome/home_friend_shadow_bg.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/Contents.json similarity index 72% rename from YuMi/Assets.xcassets/low/newhome/home_friend_shadow_bg.imageset/Contents.json rename to YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/Contents.json index a09ebd69..f4ccaced 100644 --- a/YuMi/Assets.xcassets/low/newhome/home_friend_shadow_bg.imageset/Contents.json +++ b/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "home_friend_shadow_bg@2x.png", + "filename" : "home_hour_no_1_ar@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "home_friend_shadow_bg@3x.png", + "filename" : "home_hour_no_1_ar@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/home_hour_no_1_ar@2x.png b/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/home_hour_no_1_ar@2x.png new file mode 100644 index 00000000..9003e8c0 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/home_hour_no_1_ar@2x.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/home_hour_no_1_ar@3x.png b/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/home_hour_no_1_ar@3x.png new file mode 100644 index 00000000..b54c0cce Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/home_hour_no_1_ar.imageset/home_hour_no_1_ar@3x.png differ diff --git a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_entrance.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/Contents.json similarity index 72% rename from YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_entrance.imageset/Contents.json rename to YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/Contents.json index 80a2cbbe..7781bfa7 100644 --- a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_entrance.imageset/Contents.json +++ b/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "gift_weekStar_entrance@2x.png", + "filename" : "home_week_no_1_ar@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "gift_weekStar_entrance@3x.png", + "filename" : "home_week_no_1_ar@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/home_week_no_1_ar@2x.png b/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/home_week_no_1_ar@2x.png new file mode 100644 index 00000000..2ddfa32c Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/home_week_no_1_ar@2x.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/home_week_no_1_ar@3x.png b/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/home_week_no_1_ar@3x.png new file mode 100644 index 00000000..541c425c Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/home_week_no_1_ar.imageset/home_week_no_1_ar@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/ar/room_gift_noble_entrance_ar.imageset/Contents.json b/YuMi/Assets.xcassets/Language/ar/room_gift_noble_entrance_ar.imageset/Contents.json new file mode 100644 index 00000000..b7e4dfca --- /dev/null +++ b/YuMi/Assets.xcassets/Language/ar/room_gift_noble_entrance_ar.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_gift_noble_entrance_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/room_gift_noble_entrance_ar.imageset/room_gift_noble_entrance_ar.png b/YuMi/Assets.xcassets/Language/ar/room_gift_noble_entrance_ar.imageset/room_gift_noble_entrance_ar.png new file mode 100644 index 00000000..3c4b4c0b Binary files /dev/null and b/YuMi/Assets.xcassets/Language/ar/room_gift_noble_entrance_ar.imageset/room_gift_noble_entrance_ar.png differ diff --git a/YuMi/Assets.xcassets/Language/en/YearActivity_goto_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/YearActivity_goto_en.imageset/Contents.json new file mode 100644 index 00000000..e7be08e2 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/YearActivity_goto_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "YearActivity_goto_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/YearActivity_goto_en.imageset/YearActivity_goto_en.png b/YuMi/Assets.xcassets/Language/en/YearActivity_goto_en.imageset/YearActivity_goto_en.png new file mode 100644 index 00000000..d3c6af0f Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/YearActivity_goto_en.imageset/YearActivity_goto_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/_home_game_icon_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/_home_game_icon_en.imageset/Contents.json new file mode 100644 index 00000000..c6aee134 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/_home_game_icon_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "_home_game_icon_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/_home_game_icon_en.imageset/_home_game_icon_en.png b/YuMi/Assets.xcassets/Language/en/_home_game_icon_en.imageset/_home_game_icon_en.png new file mode 100644 index 00000000..bb0cee03 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/_home_game_icon_en.imageset/_home_game_icon_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/anchor_hour_rank_icon_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/anchor_hour_rank_icon_en.imageset/Contents.json new file mode 100644 index 00000000..9a6fdec2 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/anchor_hour_rank_icon_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "anchor_hour_rank_icon_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/anchor_hour_rank_icon_en.imageset/anchor_hour_rank_icon_en.png b/YuMi/Assets.xcassets/Language/en/anchor_hour_rank_icon_en.imageset/anchor_hour_rank_icon_en.png new file mode 100644 index 00000000..6a0a7e7e Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/anchor_hour_rank_icon_en.imageset/anchor_hour_rank_icon_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/anchor_pk_invite_icon_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/anchor_pk_invite_icon_en.imageset/Contents.json new file mode 100644 index 00000000..93c96733 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/anchor_pk_invite_icon_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "anchor_pk_invite_icon_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/anchor_pk_invite_icon_en.imageset/anchor_pk_invite_icon_en.png b/YuMi/Assets.xcassets/Language/en/anchor_pk_invite_icon_en.imageset/anchor_pk_invite_icon_en.png new file mode 100644 index 00000000..01b56419 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/anchor_pk_invite_icon_en.imageset/anchor_pk_invite_icon_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/anchor_pk_random_icon_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/anchor_pk_random_icon_en.imageset/Contents.json new file mode 100644 index 00000000..8ca6d49a --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/anchor_pk_random_icon_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "anchor_pk_random_icon_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/anchor_pk_random_icon_en.imageset/anchor_pk_random_icon_en.png b/YuMi/Assets.xcassets/Language/en/anchor_pk_random_icon_en.imageset/anchor_pk_random_icon_en.png new file mode 100644 index 00000000..a25c3d81 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/anchor_pk_random_icon_en.imageset/anchor_pk_random_icon_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/common_new_user_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/common_new_user_en.imageset/Contents.json new file mode 100644 index 00000000..4844eaef --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/common_new_user_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "common_new_user_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/common_new_user_en.imageset/common_new_user_en.png b/YuMi/Assets.xcassets/Language/en/common_new_user_en.imageset/common_new_user_en.png new file mode 100644 index 00000000..6bd3b8a6 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/common_new_user_en.imageset/common_new_user_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/gift_tag_latest_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/gift_tag_latest_en.imageset/Contents.json new file mode 100644 index 00000000..ef10ffa0 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/gift_tag_latest_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "gift_tag_latest_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/gift_tag_latest_en.imageset/gift_tag_latest_en.png b/YuMi/Assets.xcassets/Language/en/gift_tag_latest_en.imageset/gift_tag_latest_en.png new file mode 100644 index 00000000..b27fd6ae Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/gift_tag_latest_en.imageset/gift_tag_latest_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/gift_twelve_star_Banner_naming_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/gift_twelve_star_Banner_naming_bg_en.imageset/Contents.json new file mode 100644 index 00000000..129b3113 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/gift_twelve_star_Banner_naming_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "gift_twelve_star_Banner_naming_bg_en@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/en/gift_twelve_star_Banner_naming_bg_en.imageset/gift_twelve_star_Banner_naming_bg_en@3x.png b/YuMi/Assets.xcassets/Language/en/gift_twelve_star_Banner_naming_bg_en.imageset/gift_twelve_star_Banner_naming_bg_en@3x.png new file mode 100644 index 00000000..23e44d99 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/gift_twelve_star_Banner_naming_bg_en.imageset/gift_twelve_star_Banner_naming_bg_en@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/gift_twelve_star_Banner_rich_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/gift_twelve_star_Banner_rich_bg_en.imageset/Contents.json new file mode 100644 index 00000000..45192703 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/gift_twelve_star_Banner_rich_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "gift_twelve_star_Banner_rich_bg_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/gift_twelve_star_Banner_rich_bg_en.imageset/gift_twelve_star_Banner_rich_bg_en.png b/YuMi/Assets.xcassets/Language/en/gift_twelve_star_Banner_rich_bg_en.imageset/gift_twelve_star_Banner_rich_bg_en.png new file mode 100644 index 00000000..f1c70dc9 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/gift_twelve_star_Banner_rich_bg_en.imageset/gift_twelve_star_Banner_rich_bg_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/home_hour_no_1_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/home_hour_no_1_en.imageset/Contents.json new file mode 100644 index 00000000..d5dcfa2a --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/home_hour_no_1_en.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "home_hour_no_1_en@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "home_hour_no_1_en@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/en/home_hour_no_1_en.imageset/home_hour_no_1_en@2x.png b/YuMi/Assets.xcassets/Language/en/home_hour_no_1_en.imageset/home_hour_no_1_en@2x.png new file mode 100644 index 00000000..1329a2e2 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/home_hour_no_1_en.imageset/home_hour_no_1_en@2x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/home_hour_no_1_en.imageset/home_hour_no_1_en@3x.png b/YuMi/Assets.xcassets/Language/en/home_hour_no_1_en.imageset/home_hour_no_1_en@3x.png new file mode 100644 index 00000000..01958ea9 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/home_hour_no_1_en.imageset/home_hour_no_1_en@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/home_palying_icon_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/home_palying_icon_en.imageset/Contents.json new file mode 100644 index 00000000..65789b1e --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/home_palying_icon_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "home_palying_icon_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/home_palying_icon_en.imageset/home_palying_icon_en.png b/YuMi/Assets.xcassets/Language/en/home_palying_icon_en.imageset/home_palying_icon_en.png new file mode 100644 index 00000000..2e8835ab Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/home_palying_icon_en.imageset/home_palying_icon_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/home_week_no_1_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/home_week_no_1_en.imageset/Contents.json new file mode 100644 index 00000000..c44e348d --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/home_week_no_1_en.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "home_week_no_1_en@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "home_week_no_1_en@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/en/home_week_no_1_en.imageset/home_week_no_1_en@2x.png b/YuMi/Assets.xcassets/Language/en/home_week_no_1_en.imageset/home_week_no_1_en@2x.png new file mode 100644 index 00000000..a0875b23 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/home_week_no_1_en.imageset/home_week_no_1_en@2x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/home_week_no_1_en.imageset/home_week_no_1_en@3x.png b/YuMi/Assets.xcassets/Language/en/home_week_no_1_en.imageset/home_week_no_1_en@3x.png new file mode 100644 index 00000000..474d40cd Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/home_week_no_1_en.imageset/home_week_no_1_en@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/mine_info_recharge_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/mine_info_recharge_en.imageset/Contents.json new file mode 100644 index 00000000..97e619db --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/mine_info_recharge_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "mine_info_recharge_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/mine_info_recharge_en.imageset/mine_info_recharge_en.png b/YuMi/Assets.xcassets/Language/en/mine_info_recharge_en.imageset/mine_info_recharge_en.png new file mode 100644 index 00000000..4a039a61 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/mine_info_recharge_en.imageset/mine_info_recharge_en.png differ 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 new file mode 100644 index 00000000..a22478a6 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "mine_noble_center_rank_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/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 new file mode 100644 index 00000000..02aff24c Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/mine_noble_center_rank_en.imageset/mine_noble_center_rank_en.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 new file mode 100644 index 00000000..610416e3 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/mine_noble_center_tag_title_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "mine_noble_center_tag_title_bg_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/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 new file mode 100644 index 00000000..c09e2d29 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.png differ diff --git a/YuMi/Assets.xcassets/Language/en/noble_myLevel_head_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/noble_myLevel_head_en.imageset/Contents.json new file mode 100644 index 00000000..052e3506 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/noble_myLevel_head_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "noble_myLevel_head_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/noble_myLevel_head_en.imageset/noble_myLevel_head_en.png b/YuMi/Assets.xcassets/Language/en/noble_myLevel_head_en.imageset/noble_myLevel_head_en.png new file mode 100644 index 00000000..f51faa58 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/noble_myLevel_head_en.imageset/noble_myLevel_head_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_candy_tree_buy_love_title_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_candy_tree_buy_love_title_en.imageset/Contents.json new file mode 100644 index 00000000..177c89c3 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_candy_tree_buy_love_title_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_candy_tree_buy_love_title_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/room_candy_tree_buy_love_title_en.imageset/room_candy_tree_buy_love_title_en.png b/YuMi/Assets.xcassets/Language/en/room_candy_tree_buy_love_title_en.imageset/room_candy_tree_buy_love_title_en.png new file mode 100644 index 00000000..70f4ad21 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_candy_tree_buy_love_title_en.imageset/room_candy_tree_buy_love_title_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_candy_tree_confirm_buy_title_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_candy_tree_confirm_buy_title_en.imageset/Contents.json new file mode 100644 index 00000000..68723325 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_candy_tree_confirm_buy_title_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_candy_tree_confirm_buy_title_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/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 new file mode 100644 index 00000000..bab0df08 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_candy_tree_confirm_buy_title_en.imageset/room_candy_tree_confirm_buy_title_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_candy_tree_frist_tap_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_candy_tree_frist_tap_bg_en.imageset/Contents.json new file mode 100644 index 00000000..bd510fad --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_candy_tree_frist_tap_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_candy_tree_frist_tap_bg_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/room_candy_tree_frist_tap_bg_en.imageset/room_candy_tree_frist_tap_bg_en.png b/YuMi/Assets.xcassets/Language/en/room_candy_tree_frist_tap_bg_en.imageset/room_candy_tree_frist_tap_bg_en.png new file mode 100644 index 00000000..c94e2d29 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_candy_tree_frist_tap_bg_en.imageset/room_candy_tree_frist_tap_bg_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_candy_tree_hundredth_tap_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_candy_tree_hundredth_tap_bg_en.imageset/Contents.json new file mode 100644 index 00000000..df00cbfd --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_candy_tree_hundredth_tap_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_candy_tree_hundredth_tap_bg_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/room_candy_tree_hundredth_tap_bg_en.imageset/room_candy_tree_hundredth_tap_bg_en.png b/YuMi/Assets.xcassets/Language/en/room_candy_tree_hundredth_tap_bg_en.imageset/room_candy_tree_hundredth_tap_bg_en.png new file mode 100644 index 00000000..08b52732 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_candy_tree_hundredth_tap_bg_en.imageset/room_candy_tree_hundredth_tap_bg_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_candy_tree_ten_tap_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_candy_tree_ten_tap_bg_en.imageset/Contents.json new file mode 100644 index 00000000..7d876e12 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_candy_tree_ten_tap_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_candy_tree_ten_tap_bg_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/room_candy_tree_ten_tap_bg_en.imageset/room_candy_tree_ten_tap_bg_en.png b/YuMi/Assets.xcassets/Language/en/room_candy_tree_ten_tap_bg_en.imageset/room_candy_tree_ten_tap_bg_en.png new file mode 100644 index 00000000..d33af471 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_candy_tree_ten_tap_bg_en.imageset/room_candy_tree_ten_tap_bg_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_candy_two_hundredth_tap_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_candy_two_hundredth_tap_bg_en.imageset/Contents.json new file mode 100644 index 00000000..e422aafc --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_candy_two_hundredth_tap_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_candy_two_hundredth_tap_bg_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/room_candy_two_hundredth_tap_bg_en.imageset/room_candy_two_hundredth_tap_bg_en.png b/YuMi/Assets.xcassets/Language/en/room_candy_two_hundredth_tap_bg_en.imageset/room_candy_two_hundredth_tap_bg_en.png new file mode 100644 index 00000000..8dc8bcf8 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_candy_two_hundredth_tap_bg_en.imageset/room_candy_two_hundredth_tap_bg_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_gift_noble_entrance_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_gift_noble_entrance_en.imageset/Contents.json index 1317537e..36e98315 100644 --- a/YuMi/Assets.xcassets/Language/en/room_gift_noble_entrance_en.imageset/Contents.json +++ b/YuMi/Assets.xcassets/Language/en/room_gift_noble_entrance_en.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "room_gift_noble_entrance_en_en.png", + "filename" : "room_gift_noble_entrance_en.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/YuMi/Assets.xcassets/Language/en/room_gift_noble_entrance_en.imageset/room_gift_noble_entrance_en.png b/YuMi/Assets.xcassets/Language/en/room_gift_noble_entrance_en.imageset/room_gift_noble_entrance_en.png new file mode 100644 index 00000000..02df93b3 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_gift_noble_entrance_en.imageset/room_gift_noble_entrance_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_gift_noble_entrance_en.imageset/room_gift_noble_entrance_en_en.png b/YuMi/Assets.xcassets/Language/en/room_gift_noble_entrance_en.imageset/room_gift_noble_entrance_en_en.png deleted file mode 100644 index 554b9451..00000000 Binary files a/YuMi/Assets.xcassets/Language/en/room_gift_noble_entrance_en.imageset/room_gift_noble_entrance_en_en.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/Language/en/room_gift_super_gift_icon_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_gift_super_gift_icon_en.imageset/Contents.json new file mode 100644 index 00000000..b46ca71e --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_gift_super_gift_icon_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "room_gift_super_gift_icon_en@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/Language/en/room_gift_super_gift_icon_en.imageset/room_gift_super_gift_icon_en@3x.png b/YuMi/Assets.xcassets/Language/en/room_gift_super_gift_icon_en.imageset/room_gift_super_gift_icon_en@3x.png new file mode 100644 index 00000000..5b4c8261 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_gift_super_gift_icon_en.imageset/room_gift_super_gift_icon_en@3x.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_pk_result_top_draw_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_pk_result_top_draw_bg_en.imageset/Contents.json new file mode 100644 index 00000000..dfadbcb9 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_pk_result_top_draw_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_pk_result_top_draw_bg_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/room_pk_result_top_draw_bg_en.imageset/room_pk_result_top_draw_bg_en.png b/YuMi/Assets.xcassets/Language/en/room_pk_result_top_draw_bg_en.imageset/room_pk_result_top_draw_bg_en.png new file mode 100644 index 00000000..8b0bab05 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_pk_result_top_draw_bg_en.imageset/room_pk_result_top_draw_bg_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_pk_result_top_loser_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_pk_result_top_loser_bg_en.imageset/Contents.json new file mode 100644 index 00000000..e7636e88 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_pk_result_top_loser_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_pk_result_top_loser_bg_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/room_pk_result_top_loser_bg_en.imageset/room_pk_result_top_loser_bg_en.png b/YuMi/Assets.xcassets/Language/en/room_pk_result_top_loser_bg_en.imageset/room_pk_result_top_loser_bg_en.png new file mode 100644 index 00000000..d3d6d756 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_pk_result_top_loser_bg_en.imageset/room_pk_result_top_loser_bg_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_pk_result_top_win_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_pk_result_top_win_bg_en.imageset/Contents.json new file mode 100644 index 00000000..f5a2538f --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_pk_result_top_win_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_pk_result_top_win_bg_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/room_pk_result_top_win_bg_en.imageset/room_pk_result_top_win_bg_en.png b/YuMi/Assets.xcassets/Language/en/room_pk_result_top_win_bg_en.imageset/room_pk_result_top_win_bg_en.png new file mode 100644 index 00000000..47407741 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_pk_result_top_win_bg_en.imageset/room_pk_result_top_win_bg_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_buy_elf_title_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_buy_elf_title_en.imageset/Contents.json new file mode 100644 index 00000000..3273fc6c --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_buy_elf_title_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_treasure_fairy_buy_elf_title_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/room_treasure_fairy_buy_elf_title_en.imageset/room_treasure_fairy_buy_elf_title_en.png b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_buy_elf_title_en.imageset/room_treasure_fairy_buy_elf_title_en.png new file mode 100644 index 00000000..1777a3b7 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_buy_elf_title_en.imageset/room_treasure_fairy_buy_elf_title_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_hundred_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_hundred_bg_en.imageset/Contents.json new file mode 100644 index 00000000..ca067439 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_hundred_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_treasure_fairy_hundred_bg_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/room_treasure_fairy_hundred_bg_en.imageset/room_treasure_fairy_hundred_bg_en.png b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_hundred_bg_en.imageset/room_treasure_fairy_hundred_bg_en.png new file mode 100644 index 00000000..46ed38eb Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_hundred_bg_en.imageset/room_treasure_fairy_hundred_bg_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_one_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_one_bg_en.imageset/Contents.json new file mode 100644 index 00000000..f9a4147c --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_one_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_treasure_fairy_one_bg_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/room_treasure_fairy_one_bg_en.imageset/room_treasure_fairy_one_bg_en.png b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_one_bg_en.imageset/room_treasure_fairy_one_bg_en.png new file mode 100644 index 00000000..f0a7f9de Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_one_bg_en.imageset/room_treasure_fairy_one_bg_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_ten_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_ten_bg_en.imageset/Contents.json new file mode 100644 index 00000000..a2a30014 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_ten_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_treasure_fairy_ten_bg_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/room_treasure_fairy_ten_bg_en.imageset/room_treasure_fairy_ten_bg_en.png b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_ten_bg_en.imageset/room_treasure_fairy_ten_bg_en.png new file mode 100644 index 00000000..8cd0c941 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_ten_bg_en.imageset/room_treasure_fairy_ten_bg_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_ticket_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_ticket_en.imageset/Contents.json new file mode 100644 index 00000000..17eb386f --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_ticket_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_treasure_fairy_ticket_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/room_treasure_fairy_ticket_en.imageset/room_treasure_fairy_ticket_en.png b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_ticket_en.imageset/room_treasure_fairy_ticket_en.png new file mode 100644 index 00000000..03728e6a Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_ticket_en.imageset/room_treasure_fairy_ticket_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_middle_title_normal_en 1.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_middle_title_normal_en 1.imageset/Contents.json new file mode 100644 index 00000000..1d83b80e --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_middle_title_normal_en 1.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_treasure_fairy_trials_middle_title_normal_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/room_treasure_fairy_trials_middle_title_normal_en 1.imageset/room_treasure_fairy_trials_middle_title_normal_en.png b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_middle_title_normal_en 1.imageset/room_treasure_fairy_trials_middle_title_normal_en.png new file mode 100644 index 00000000..78b42a49 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_middle_title_normal_en 1.imageset/room_treasure_fairy_trials_middle_title_normal_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_middle_title_select_en 1.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_middle_title_select_en 1.imageset/Contents.json new file mode 100644 index 00000000..f2edc0b3 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_middle_title_select_en 1.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_treasure_fairy_trials_middle_title_select_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/room_treasure_fairy_trials_middle_title_select_en 1.imageset/room_treasure_fairy_trials_middle_title_select_en.png b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_middle_title_select_en 1.imageset/room_treasure_fairy_trials_middle_title_select_en.png new file mode 100644 index 00000000..76e46941 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_middle_title_select_en 1.imageset/room_treasure_fairy_trials_middle_title_select_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_salvage_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_salvage_bg_en.imageset/Contents.json new file mode 100644 index 00000000..7293eec0 --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_salvage_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "room_treasure_fairy_trials_salvage_bg_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/room_treasure_fairy_trials_salvage_bg_en.imageset/room_treasure_fairy_trials_salvage_bg_en.png b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_salvage_bg_en.imageset/room_treasure_fairy_trials_salvage_bg_en.png new file mode 100644 index 00000000..cf8b70b6 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/room_treasure_fairy_trials_salvage_bg_en.imageset/room_treasure_fairy_trials_salvage_bg_en.png differ diff --git a/YuMi/Assets.xcassets/Language/en/version_update_top_bg_en.imageset/Contents.json b/YuMi/Assets.xcassets/Language/en/version_update_top_bg_en.imageset/Contents.json new file mode 100644 index 00000000..1edcffae --- /dev/null +++ b/YuMi/Assets.xcassets/Language/en/version_update_top_bg_en.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "version_update_top_bg_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/version_update_top_bg_en.imageset/version_update_top_bg_en.png b/YuMi/Assets.xcassets/Language/en/version_update_top_bg_en.imageset/version_update_top_bg_en.png new file mode 100644 index 00000000..06d43268 Binary files /dev/null and b/YuMi/Assets.xcassets/Language/en/version_update_top_bg_en.imageset/version_update_top_bg_en.png differ diff --git a/YuMi/Assets.xcassets/jm/Noble/room_gift_noble_entrance.imageset/Contents.json b/YuMi/Assets.xcassets/jm/Noble/room_gift_noble_entrance.imageset/Contents.json index 9710f08b..252e9e68 100644 --- a/YuMi/Assets.xcassets/jm/Noble/room_gift_noble_entrance.imageset/Contents.json +++ b/YuMi/Assets.xcassets/jm/Noble/room_gift_noble_entrance.imageset/Contents.json @@ -1,16 +1,15 @@ { "images" : [ { + "filename" : "room_gift_noble_entrance.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "room_gift_noble_entrance@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "room_gift_noble_entrance@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/jm/Noble/room_gift_noble_entrance.imageset/room_gift_noble_entrance.png b/YuMi/Assets.xcassets/jm/Noble/room_gift_noble_entrance.imageset/room_gift_noble_entrance.png new file mode 100644 index 00000000..63fde62c Binary files /dev/null and b/YuMi/Assets.xcassets/jm/Noble/room_gift_noble_entrance.imageset/room_gift_noble_entrance.png differ diff --git a/YuMi/Assets.xcassets/jm/Noble/room_gift_noble_entrance.imageset/room_gift_noble_entrance@2x.png b/YuMi/Assets.xcassets/jm/Noble/room_gift_noble_entrance.imageset/room_gift_noble_entrance@2x.png deleted file mode 100644 index 0ad71f92..00000000 Binary files a/YuMi/Assets.xcassets/jm/Noble/room_gift_noble_entrance.imageset/room_gift_noble_entrance@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/jm/Noble/room_gift_noble_entrance.imageset/room_gift_noble_entrance@3x.png b/YuMi/Assets.xcassets/jm/Noble/room_gift_noble_entrance.imageset/room_gift_noble_entrance@3x.png deleted file mode 100644 index d0c781e9..00000000 Binary files a/YuMi/Assets.xcassets/jm/Noble/room_gift_noble_entrance.imageset/room_gift_noble_entrance@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/Contents.json b/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/Contents.json index 385d8943..a6735e1d 100644 --- a/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/Contents.json +++ b/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "yumi_ming_setting_about_us@2x.png", + "filename" : "ming_setting_about_us@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "yumi_ming_setting_about_us@3x.png", + "filename" : "ming_setting_about_us@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/ming_setting_about_us@2x.png b/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/ming_setting_about_us@2x.png new file mode 100644 index 00000000..6d4e3f87 Binary files /dev/null and b/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/ming_setting_about_us@2x.png differ diff --git a/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/ming_setting_about_us@3x.png b/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/ming_setting_about_us@3x.png new file mode 100644 index 00000000..15a04a8f Binary files /dev/null and b/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/ming_setting_about_us@3x.png differ diff --git a/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/yumi_ming_setting_about_us@2x.png b/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/yumi_ming_setting_about_us@2x.png deleted file mode 100644 index ad30012b..00000000 Binary files a/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/yumi_ming_setting_about_us@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/yumi_ming_setting_about_us@3x.png b/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/yumi_ming_setting_about_us@3x.png deleted file mode 100644 index e711891b..00000000 Binary files a/YuMi/Assets.xcassets/jm/Setting/ming_setting_about_us.imageset/yumi_ming_setting_about_us@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/low/ms_home_heat_icon.imageset/Contents.json b/YuMi/Assets.xcassets/low/ms_home_heat_icon.imageset/Contents.json new file mode 100644 index 00000000..b10f47bc --- /dev/null +++ b/YuMi/Assets.xcassets/low/ms_home_heat_icon.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_home_heat_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_home_heat_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/low/ms_home_heat_icon.imageset/ms_home_heat_icon@2x.png b/YuMi/Assets.xcassets/low/ms_home_heat_icon.imageset/ms_home_heat_icon@2x.png new file mode 100644 index 00000000..2df8ed94 Binary files /dev/null and b/YuMi/Assets.xcassets/low/ms_home_heat_icon.imageset/ms_home_heat_icon@2x.png differ diff --git a/YuMi/Assets.xcassets/low/ms_home_heat_icon.imageset/ms_home_heat_icon@3x.png b/YuMi/Assets.xcassets/low/ms_home_heat_icon.imageset/ms_home_heat_icon@3x.png new file mode 100644 index 00000000..5220cc27 Binary files /dev/null and b/YuMi/Assets.xcassets/low/ms_home_heat_icon.imageset/ms_home_heat_icon@3x.png differ diff --git a/YuMi/Assets.xcassets/low/newhome/home_friend_shadow_bg.imageset/home_friend_shadow_bg@2x.png b/YuMi/Assets.xcassets/low/newhome/home_friend_shadow_bg.imageset/home_friend_shadow_bg@2x.png deleted file mode 100644 index 0ed1b9c6..00000000 Binary files a/YuMi/Assets.xcassets/low/newhome/home_friend_shadow_bg.imageset/home_friend_shadow_bg@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/low/newhome/home_friend_shadow_bg.imageset/home_friend_shadow_bg@3x.png b/YuMi/Assets.xcassets/low/newhome/home_friend_shadow_bg.imageset/home_friend_shadow_bg@3x.png deleted file mode 100644 index e8279daa..00000000 Binary files a/YuMi/Assets.xcassets/low/newhome/home_friend_shadow_bg.imageset/home_friend_shadow_bg@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/low/newhome/home_hour_no_1.imageset/home_hour_no_1@2x.png b/YuMi/Assets.xcassets/low/newhome/home_hour_no_1.imageset/home_hour_no_1@2x.png index b9513865..ded641e0 100644 Binary files a/YuMi/Assets.xcassets/low/newhome/home_hour_no_1.imageset/home_hour_no_1@2x.png and b/YuMi/Assets.xcassets/low/newhome/home_hour_no_1.imageset/home_hour_no_1@2x.png differ diff --git a/YuMi/Assets.xcassets/low/newhome/home_hour_no_1.imageset/home_hour_no_1@3x.png b/YuMi/Assets.xcassets/low/newhome/home_hour_no_1.imageset/home_hour_no_1@3x.png index 1b287c56..e3f9cff5 100644 Binary files a/YuMi/Assets.xcassets/low/newhome/home_hour_no_1.imageset/home_hour_no_1@3x.png and b/YuMi/Assets.xcassets/low/newhome/home_hour_no_1.imageset/home_hour_no_1@3x.png differ diff --git a/YuMi/Assets.xcassets/low/newhome/home_week_no_1.imageset/home_week_no_1@2x.png b/YuMi/Assets.xcassets/low/newhome/home_week_no_1.imageset/home_week_no_1@2x.png index 4237da16..b346c525 100644 Binary files a/YuMi/Assets.xcassets/low/newhome/home_week_no_1.imageset/home_week_no_1@2x.png and b/YuMi/Assets.xcassets/low/newhome/home_week_no_1.imageset/home_week_no_1@2x.png differ diff --git a/YuMi/Assets.xcassets/low/newhome/home_week_no_1.imageset/home_week_no_1@3x.png b/YuMi/Assets.xcassets/low/newhome/home_week_no_1.imageset/home_week_no_1@3x.png index 4c16bd8a..1178276f 100644 Binary files a/YuMi/Assets.xcassets/low/newhome/home_week_no_1.imageset/home_week_no_1@3x.png and b/YuMi/Assets.xcassets/low/newhome/home_week_no_1.imageset/home_week_no_1@3x.png differ diff --git a/YuMi/Assets.xcassets/low/newhome/ms_hoem_index_icon.imageset/Contents.json b/YuMi/Assets.xcassets/low/newhome/ms_hoem_index_icon.imageset/Contents.json new file mode 100644 index 00000000..2e15862a --- /dev/null +++ b/YuMi/Assets.xcassets/low/newhome/ms_hoem_index_icon.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "ms_hoem_index_icon@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "ms_hoem_index_icon@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/low/newhome/ms_hoem_index_icon.imageset/ms_hoem_index_icon@2x.png b/YuMi/Assets.xcassets/low/newhome/ms_hoem_index_icon.imageset/ms_hoem_index_icon@2x.png new file mode 100644 index 00000000..67ac396a Binary files /dev/null and b/YuMi/Assets.xcassets/low/newhome/ms_hoem_index_icon.imageset/ms_hoem_index_icon@2x.png differ diff --git a/YuMi/Assets.xcassets/low/newhome/ms_hoem_index_icon.imageset/ms_hoem_index_icon@3x.png b/YuMi/Assets.xcassets/low/newhome/ms_hoem_index_icon.imageset/ms_hoem_index_icon@3x.png new file mode 100644 index 00000000..d3f122fb Binary files /dev/null and b/YuMi/Assets.xcassets/low/newhome/ms_hoem_index_icon.imageset/ms_hoem_index_icon@3x.png differ diff --git a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_entrance.imageset/gift_weekStar_entrance@2x.png b/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_entrance.imageset/gift_weekStar_entrance@2x.png deleted file mode 100644 index 53413405..00000000 Binary files a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_entrance.imageset/gift_weekStar_entrance@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_entrance.imageset/gift_weekStar_entrance@3x.png b/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_entrance.imageset/gift_weekStar_entrance@3x.png deleted file mode 100644 index 0a8e198c..00000000 Binary files a/YuMi/Assets.xcassets/middle/GiftWeekStarTab/gift_weekStar_entrance.imageset/gift_weekStar_entrance@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/utils/common_avatar.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_avatar.imageset/Contents.json index 3dee53c7..cb83cb72 100644 --- a/YuMi/Assets.xcassets/utils/common_avatar.imageset/Contents.json +++ b/YuMi/Assets.xcassets/utils/common_avatar.imageset/Contents.json @@ -1,16 +1,15 @@ { "images" : [ { + "filename" : "common_avatar.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "common_avatar@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "common_avatar@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/utils/common_avatar.imageset/common_avatar.png b/YuMi/Assets.xcassets/utils/common_avatar.imageset/common_avatar.png new file mode 100644 index 00000000..73c2819c Binary files /dev/null and b/YuMi/Assets.xcassets/utils/common_avatar.imageset/common_avatar.png differ diff --git a/YuMi/Assets.xcassets/utils/common_avatar.imageset/common_avatar@2x.png b/YuMi/Assets.xcassets/utils/common_avatar.imageset/common_avatar@2x.png deleted file mode 100644 index 7e45c42a..00000000 Binary files a/YuMi/Assets.xcassets/utils/common_avatar.imageset/common_avatar@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/utils/common_avatar.imageset/common_avatar@3x.png b/YuMi/Assets.xcassets/utils/common_avatar.imageset/common_avatar@3x.png deleted file mode 100644 index 863341f1..00000000 Binary files a/YuMi/Assets.xcassets/utils/common_avatar.imageset/common_avatar@3x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/utils/common_banner.imageset/Contents.json b/YuMi/Assets.xcassets/utils/common_banner.imageset/Contents.json index 007307e6..c0a7a611 100644 --- a/YuMi/Assets.xcassets/utils/common_banner.imageset/Contents.json +++ b/YuMi/Assets.xcassets/utils/common_banner.imageset/Contents.json @@ -1,16 +1,15 @@ { "images" : [ { + "filename" : "common_banner.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "common_banner@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "common_banner@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/YuMi/Assets.xcassets/utils/common_banner.imageset/common_banner.png b/YuMi/Assets.xcassets/utils/common_banner.imageset/common_banner.png new file mode 100644 index 00000000..169ac972 Binary files /dev/null and b/YuMi/Assets.xcassets/utils/common_banner.imageset/common_banner.png differ diff --git a/YuMi/Assets.xcassets/utils/common_banner.imageset/common_banner@2x.png b/YuMi/Assets.xcassets/utils/common_banner.imageset/common_banner@2x.png deleted file mode 100644 index 47959056..00000000 Binary files a/YuMi/Assets.xcassets/utils/common_banner.imageset/common_banner@2x.png and /dev/null differ diff --git a/YuMi/Assets.xcassets/utils/common_banner.imageset/common_banner@3x.png b/YuMi/Assets.xcassets/utils/common_banner.imageset/common_banner@3x.png deleted file mode 100644 index 3b9a3757..00000000 Binary files a/YuMi/Assets.xcassets/utils/common_banner.imageset/common_banner@3x.png and /dev/null differ diff --git a/YuMi/Config/ClientConfig.m b/YuMi/Config/ClientConfig.m index 65d6996c..04b723fc 100644 --- a/YuMi/Config/ClientConfig.m +++ b/YuMi/Config/ClientConfig.m @@ -43,10 +43,6 @@ if (code == 200) { self.retryCount = 0; NSDictionary * initData = data.data; - - - - self.iosPhoneBind = [initData[@"iosPhoneBind"] boolValue]; //糖果树配置 self.openCandyTree = [initData[@"openBoxSwitch"] boolValue]; diff --git a/YuMi/CustomUI/Adbvertise/XPAdvertiseView.m b/YuMi/CustomUI/Adbvertise/XPAdvertiseView.m index 4dec837a..90f15a55 100644 --- a/YuMi/CustomUI/Adbvertise/XPAdvertiseView.m +++ b/YuMi/CustomUI/Adbvertise/XPAdvertiseView.m @@ -49,6 +49,12 @@ static int const showtime = 3; UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTapAdViewAction)]; [_adView addGestureRecognizer:tap]; [self addSubview:self.countdownButton]; + [self.countdownButton mas_makeConstraints:^(MASConstraintMaker *make) { + make.trailing.mas_equalTo(-24); + make.width.mas_equalTo(60); + make.height.mas_equalTo(30); + make.top.mas_equalTo(40); + }]; // // 因为倒数跳秒问题，导致无法及时响应事件，经测试提案说无法接受此结果。所以就做成和安卓一样，去掉倒计时和跳过 // if ([self needCountDownBtn]) { // [self addSubview:self.countdownButton]; @@ -188,10 +194,8 @@ static int const showtime = 3; - (UIButton *)countdownButton { if (_countdownButton == nil) { - CGFloat btnW = 60; - CGFloat btnH = 30; + _countdownButton = [UIButton buttonWithType:UIButtonTypeCustom]; - _countdownButton.frame = CGRectMake(KScreenWidth - btnW - 24, btnH + 10, btnW, btnH); [_countdownButton addTarget:self action:@selector(onClickSkipButton:) forControlEvents:UIControlEventTouchUpInside]; [_countdownButton setTitle:YMLocalizedString(@"XPAdvertiseView1") forState:UIControlStateNormal]; _countdownButton.titleLabel.font = [UIFont systemFontOfSize:15]; diff --git a/YuMi/CustomUI/MSRTL/MSBaseTextField.h b/YuMi/CustomUI/MSRTL/MSBaseTextField.h new file mode 100644 index 00000000..af616ac4 --- /dev/null +++ b/YuMi/CustomUI/MSRTL/MSBaseTextField.h @@ -0,0 +1,16 @@ +// +// MSBaseTextField.h +// YuMi +// +// Created by duoban on 2024/4/15. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface MSBaseTextField : UITextField + +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/MSRTL/MSBaseTextField.m b/YuMi/CustomUI/MSRTL/MSBaseTextField.m new file mode 100644 index 00000000..98d5eb73 --- /dev/null +++ b/YuMi/CustomUI/MSRTL/MSBaseTextField.m @@ -0,0 +1,22 @@ +// +// MSBaseTextField.m +// YuMi +// +// Created by duoban on 2024/4/15. +// + +#import "MSBaseTextField.h" + +@implementation MSBaseTextField + +-(instancetype)init{ + self = [super init]; + if(self){ +// if(isMSRTL()){ +// self.textAlignment = NSTextAlignmentRight; +// } + } + return self; +} + +@end diff --git a/YuMi/CustomUI/MSRTL/UILabel+MSRTL.m b/YuMi/CustomUI/MSRTL/UILabel+MSRTL.m index 16c39b4c..70248448 100644 --- a/YuMi/CustomUI/MSRTL/UILabel+MSRTL.m +++ b/YuMi/CustomUI/MSRTL/UILabel+MSRTL.m @@ -6,7 +6,7 @@ // #import "UILabel+MSRTL.h" - +#import "NSMutableAttributedString+MSRTL.h" @implementation UILabel (MSRTL) + (void)load { @@ -18,6 +18,35 @@ Method oldTextMethod = class_getInstanceMethod(self,@selector(setTextAlignment:)); Method newTextMethod = class_getInstanceMethod(self, @selector(msrtl_setTextAlignment:)); method_exchangeImplementations(oldTextMethod, newTextMethod); //交换成功 + + 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]; + if([NSStringFromClass([self class])isEqualToString:@"UITextFieldLabel"] || self.textAlignment == NSTextAlignmentCenter){ + if (isMSRTL() ) { + // 插入RTL + [attributedString appendAttributedString:[NSMutableAttributedString createBlankAttributeToMSRTL]]; + + } + [attributedString appendAttributedString:attributedText]; + [self msrtl_setAttributedText:attributedString]; + return; + } + + + if (isMSRTL() ) { + // 插入RTL + + [attributedString appendAttributedString:[NSMutableAttributedString createBlankAttributeToMSRTL]]; + + } + [attributedString appendAttributedString:attributedText]; + [self msrtl_setAttributedText:attributedString]; + } - (instancetype)msrtl_initWithFrame:(CGRect)frame { diff --git a/YuMi/CustomUI/MSRTL/UITextField+MSRTL.m b/YuMi/CustomUI/MSRTL/UITextField+MSRTL.m index 70be3a36..9588352b 100644 --- a/YuMi/CustomUI/MSRTL/UITextField+MSRTL.m +++ b/YuMi/CustomUI/MSRTL/UITextField+MSRTL.m @@ -17,13 +17,13 @@ Method newInitMethod = class_getInstanceMethod(self, @selector(msrtl_initWithFrame:)); method_exchangeImplementations(oldInitMethod, newInitMethod); //交换成功 - Method oldTextMethod1 = class_getInstanceMethod(self,@selector(setPlaceholder:)); - Method newTextMethod1 = class_getInstanceMethod(self, @selector(msrtl_setPlaceholder:)); - method_exchangeImplementations(oldTextMethod1, newTextMethod1); //交换成功 - - Method oldTextMethod = class_getInstanceMethod(self,@selector(setTextAlignment:)); - Method newTextMethod = class_getInstanceMethod(self, @selector(msrtl_setTextAlignment:)); - method_exchangeImplementations(oldTextMethod, newTextMethod); //交换成功 +// Method oldTextMethod1 = class_getInstanceMethod(self,@selector(setPlaceholder:)); +// Method newTextMethod1 = class_getInstanceMethod(self, @selector(msrtl_setPlaceholder:)); +// method_exchangeImplementations(oldTextMethod1, newTextMethod1); //交换成功 +// +// Method oldTextMethod = class_getInstanceMethod(self,@selector(setTextAlignment:)); +// Method newTextMethod = class_getInstanceMethod(self, @selector(msrtl_setTextAlignment:)); +// method_exchangeImplementations(oldTextMethod, newTextMethod); //交换成功 Method oldMethod = class_getInstanceMethod(self,@selector(setAttributedPlaceholder:)); Method newMethod = class_getInstanceMethod(self, @selector(msrtl_setAttributedPlaceholder:)); method_exchangeImplementations(oldMethod, newMethod); //交换成功 @@ -44,14 +44,17 @@ } - (instancetype)msrtl_initWithFrame:(CGRect)frame { if ([self msrtl_initWithFrame:frame]) { - self.textAlignment = NSTextAlignmentNatural; + + if(isMSRTL()){ + self.textAlignment = NSTextAlignmentRight; + } } return self; } - (void)msrtl_setAttributedPlaceholder:(NSAttributedString *)attributedPlaceholder{ NSMutableAttributedString *att = [[NSMutableAttributedString alloc]initWithAttributedString:attributedPlaceholder]; NSMutableParagraphStyle *paragraph = [[NSMutableParagraphStyle alloc] init]; - NSTextAlignment textAli = NSTextAlignmentRight; + NSTextAlignment textAli = NSTextAlignmentLeft; paragraph.alignment = textAli; [att addAttributes:@{NSParagraphStyleAttributeName: paragraph} range:[attributedPlaceholder.string rangeOfString:attributedPlaceholder.string]]; [self msrtl_setAttributedPlaceholder:att]; diff --git a/YuMi/CustomUI/MSRTL/UITextView+MSRTL.m b/YuMi/CustomUI/MSRTL/UITextView+MSRTL.m index 36188a79..cd5d2f11 100644 --- a/YuMi/CustomUI/MSRTL/UITextView+MSRTL.m +++ b/YuMi/CustomUI/MSRTL/UITextView+MSRTL.m @@ -51,7 +51,7 @@ - (void)msrtl_setAttributedPlaceholder:(NSAttributedString *)attributedPlaceholder{ NSMutableAttributedString *att = [[NSMutableAttributedString alloc]initWithAttributedString:attributedPlaceholder]; NSMutableParagraphStyle *paragraph = [[NSMutableParagraphStyle alloc] init]; - NSTextAlignment textAli = NSTextAlignmentRight; + NSTextAlignment textAli = isMSRTL() ? NSTextAlignmentRight : NSTextAlignmentLeft; paragraph.alignment = textAli; [att addAttributes:@{NSParagraphStyleAttributeName: paragraph} range:[attributedPlaceholder.string rangeOfString:attributedPlaceholder.string]]; [self msrtl_setAttributedPlaceholder:att]; diff --git a/YuMi/CustomUI/MSRTL/YYLabel+MSRTL.h b/YuMi/CustomUI/MSRTL/YYLabel+MSRTL.h new file mode 100644 index 00000000..2080d2f0 --- /dev/null +++ b/YuMi/CustomUI/MSRTL/YYLabel+MSRTL.h @@ -0,0 +1,16 @@ +// +// MSRTL.h +// YuMi +// +// Created by duoban on 2024/4/15. +// + +#import + +NS_ASSUME_NONNULL_BEGIN +@interface YYLabel (MSRTL) + + +@end + +NS_ASSUME_NONNULL_END diff --git a/YuMi/CustomUI/MSRTL/YYLabel+MSRTL.m b/YuMi/CustomUI/MSRTL/YYLabel+MSRTL.m new file mode 100644 index 00000000..a802b33c --- /dev/null +++ b/YuMi/CustomUI/MSRTL/YYLabel+MSRTL.m @@ -0,0 +1,61 @@ +// +// MSRTL.m +// YuMi +// +// Created by duoban on 2024/4/15. +// + +#import "YYLabel+MSRTL.h" +#import "NSMutableAttributedString+MSRTL.h" +BOOL isRTLString(NSString *string) { + if ([string hasPrefix:@"\u202B"]) { + return YES; + } + return NO; +} +@implementation YYLabel (MSRTL) + ++ (void)load { + + + + Method oldTextMethod = class_getInstanceMethod(self,@selector(setAttributedText:)); + Method newTextMethod = class_getInstanceMethod(self, @selector(msrtl_setAttributedText:)); + method_exchangeImplementations(oldTextMethod, newTextMethod); //交换成功 + + + + + +} + +-(void)msrtl_setAttributedText:(NSAttributedString *)attributedText{ + NSMutableAttributedString * attributedString = [[NSMutableAttributedString alloc]init]; + if(self.textAlignment == NSTextAlignmentCenter){ + if (isMSRTL()) { + [attributedString appendAttributedString:[NSMutableAttributedString createBlankAttributeToMSRTL]]; +// [attributedString appendAttributedString:[NSMutableAttributedString createBlankAttributeToMSLTR]]; + } + [attributedString appendAttributedString:attributedText]; + [self msrtl_setAttributedText:attributedString]; + return; + } + + + if (isMSRTL()) { + [attributedString appendAttributedString:[NSMutableAttributedString createBlankAttributeToMSRTL]]; +// [attributedString appendAttributedString:[NSMutableAttributedString createBlankAttributeToMSLTR]]; + } + [attributedString appendAttributedString:attributedText]; + [self msrtl_setAttributedText:attributedString]; + if(isMSRTL()){ + self.textAlignment = NSTextAlignmentRight; + }else{ + if (self.textAlignment == NSTextAlignmentNatural) { + self.textAlignment = NSTextAlignmentLeft; + } + } + +} + +@end diff --git a/YuMi/CustomUI/ShareView/View/XPShareItemCell.m b/YuMi/CustomUI/ShareView/View/XPShareItemCell.m index e36a375e..6a56068c 100644 --- a/YuMi/CustomUI/ShareView/View/XPShareItemCell.m +++ b/YuMi/CustomUI/ShareView/View/XPShareItemCell.m @@ -34,14 +34,14 @@ } - (void)initSubViewConstraints{ - CGFloat wh = 40; + CGFloat wh = 30; [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.equalTo(@(wh)); make.top.equalTo(self.contentView); make.centerX.equalTo(self.contentView); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.contentView); + make.trailing.leading.equalTo(self.contentView).inset(5); make.top.equalTo(self.iconImageView.mas_bottom).offset(10); }]; } @@ -70,6 +70,7 @@ _titleLabel = [[UILabel alloc] init]; _titleLabel.textColor = [DJDKMIMOMColor alertMessageColor]; _titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size:12]; + _titleLabel.numberOfLines = 2; _titleLabel.textAlignment = NSTextAlignmentCenter; } return _titleLabel; diff --git a/YuMi/CustomUI/UIImage/UIImage+Utils.m b/YuMi/CustomUI/UIImage/UIImage+Utils.m index 5380ff8e..193b3e30 100644 --- a/YuMi/CustomUI/UIImage/UIImage+Utils.m +++ b/YuMi/CustomUI/UIImage/UIImage+Utils.m @@ -500,21 +500,29 @@ return nil; } +(UIImage *)getLanguageImage:(NSString *)image{ + NSString *curImage = image; NSString *language = [NSBundle getLanguageText]; if ([language isEqualToString:@"en"]){ image = [NSString stringWithFormat:@"%@_en",image]; }else if ([language isEqualToString:@"ar"]){ image = [NSString stringWithFormat:@"%@_ar",image]; } + if (kImage(image) == nil){ + return kImage(curImage); + } return kImage(image); } +(NSString *)getLanguageText:(NSString *)image{ + NSString *curImage = image; NSString *language = [NSBundle getLanguageText]; if ([language isEqualToString:@"en"]){ image = [NSString stringWithFormat:@"%@_en",image]; }else if ([language isEqualToString:@"ar"]){ image = [NSString stringWithFormat:@"%@_ar",image]; } + if (kImage(image) == nil){ + return curImage; + } return image; } @end diff --git a/YuMi/Info.plist b/YuMi/Info.plist index beb4bc39..f2c5266d 100644 --- a/YuMi/Info.plist +++ b/YuMi/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - Moli Star + MoliStar CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m index d7a2ae2a..cc7561f1 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m @@ -10,7 +10,7 @@ #import #import #import "LoginAreaModel.h" - +#import "MSBaseTextField.h" @interface XPLoginInputView() @property (nonatomic, strong) dispatch_source_t timer; @@ -77,7 +77,7 @@ /// 输入框 - UITextField *inputTextField = [[UITextField alloc] init]; + MSBaseTextField *inputTextField = [[MSBaseTextField alloc] init]; inputTextField.textColor = UIColorFromRGB(0x1F1B4F); inputTextField.font = kFontRegular(14); [stackView addArrangedSubview:inputTextField]; diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m index 395e2e5b..1113b49c 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m @@ -254,11 +254,17 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; - + CGFloat left = isMSRTL() ? -11 : 11; + CGFloat protocolWidth = 204; + if (isMSRTL()){ + protocolWidth = 250; + }else if (isMSEN()){ + protocolWidth = 270; + } [self.protocolLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.view).offset(10); - make.trailing.mas_lessThanOrEqualTo(-10); + make.centerX.mas_equalTo(self.view).offset(left); make.height.mas_greaterThanOrEqualTo(22); + make.width.mas_equalTo(protocolWidth); make.bottom.mas_equalTo(-kGetScaleWidth(35)); }]; [self.agreeBtn mas_makeConstraints:^(MASConstraintMaker *make) { @@ -276,7 +282,8 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; }]; [self.authBubbleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.mas_equalTo(8); - make.bottom.mas_equalTo(self.authBubbleView).mas_offset(-6); + make.trailing.mas_equalTo(-8); + make.bottom.mas_equalTo(self.authBubbleView).mas_offset(isMSZH() ? -6:0); }]; if (@available(iOS 13.0, *)) { #ifdef DEBUG @@ -424,6 +431,12 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; } /// 登录 - (void)loginBtnClicked { + if (!self.agreeBtn.selected) { + [UIView animateWithDuration:0.5 animations:^{ + self.authBubbleView.alpha = 1.0; + }]; + return; + } [XNDJTDDLoadingTool showOnlyView:self.view]; if(self.selectType == 0){ NSString *phone = self.accountView.inputTextField.text; @@ -553,10 +566,10 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; NSMutableAttributedString *attString = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPLoginViewController6")]; attString.yy_color = UIColorFromRGB(0xB3B3C3); - NSString *userString = YMLocalizedString(@"XPLoginViewController7"); - NSMutableAttributedString *userAttString = [[NSMutableAttributedString alloc] initWithString:userString attributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)}]; - @weakify(self) - [userAttString yy_setTextHighlightRange:NSMakeRange(0, userAttString.length) color:nil backgroundColor:nil userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { + NSRange userRange = [attString.string rangeOfString:YMLocalizedString(@"XPLoginViewController7")]; + [attString addAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)} range:userRange]; + @weakify(self); + [attString yy_setTextHighlightRange:userRange color:nil backgroundColor:nil userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { @strongify(self); // 跳转用户协议 XPWebViewController * webVC = [[XPWebViewController alloc] init]; @@ -564,20 +577,19 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; [self.navigationController pushViewController:webVC animated:YES]; } longPressAction:nil]; - NSMutableAttributedString *andString = [[NSMutableAttributedString alloc] initWithString:YMLocalizedString(@"XPLoginViewController8")]; - andString.yy_color = UIColorFromRGB(0xB3B3C3); - NSString *protocolString = YMLocalizedString(@"XPLoginViewController9"); - NSMutableAttributedString *privateString = [[NSMutableAttributedString alloc] initWithString:protocolString attributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)}]; - [privateString yy_setTextHighlightRange:NSMakeRange(0, privateString.length) color:nil backgroundColor:nil userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { + NSRange andRange = [attString.string rangeOfString:YMLocalizedString(@"XPLoginViewController8")]; + [attString addAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0xB3B3C3)} range:andRange]; + NSRange protocolRange = [attString.string rangeOfString:YMLocalizedString(@"XPLoginViewController9")]; + [attString addAttributes:@{NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)} range:protocolRange]; + + [attString yy_setTextHighlightRange:protocolRange color:nil backgroundColor:nil userInfo:nil tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) { @strongify(self); // 跳转隐私政策 XPWebViewController * webVC = [[XPWebViewController alloc] init]; webVC.url = URLWithType(kPrivacyURL); [self.navigationController pushViewController:webVC animated:YES]; } longPressAction:nil]; - [attString appendAttributedString:userAttString]; - [attString appendAttributedString:andString]; - [attString appendAttributedString:privateString]; + _protocolLabel.attributedText = attString; } @@ -610,8 +622,9 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; if (!_authBubbleLabel) { _authBubbleLabel = [[UILabel alloc] init]; _authBubbleLabel.text = YMLocalizedString(@"XPLoginViewController11"); - _authBubbleLabel.font = [UIFont systemFontOfSize:10]; + _authBubbleLabel.font = [UIFont systemFontOfSize:9]; _authBubbleLabel.textColor = UIColor.whiteColor; + _authBubbleLabel.numberOfLines = 2; } return _authBubbleLabel; } diff --git a/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m b/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m index ac17c460..5212bd4c 100644 --- a/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m +++ b/YuMi/Modules/YMMessage/View/Session/Cell/SessionUserInfoTableViewCell.m @@ -287,10 +287,10 @@ [self.sexButton setImage:[UIImage imageNamed:@"session_user_sex_female"] forState:UIControlStateNormal]; } [self.sexButton setTitle:[NSString stringWithFormat:@"%ld", [PLTimeUtil ageWithDateFromBirth:_userInfo.birth]] forState:UIControlStateNormal]; - NSString *image = [NSString getCalculateConstellationImageWithMonth:_userInfo.birth]; - if(image.length > 0){ - self.constellationButton.image = kImage(image); - } +// NSString *image = [NSString getCalculateConstellationImageWithMonth:_userInfo.birth]; +// if(image.length > 0){ +// self.constellationButton.image = kImage(image); +// } [self.collectionView reloadData]; } } @@ -424,6 +424,7 @@ - (UIImageView *)constellationButton { if (!_constellationButton) { _constellationButton = [UIImageView new]; + _constellationButton.hidden = YES; } return _constellationButton; } diff --git a/YuMi/Modules/YMMessage/View/SessionList/SessionListCell.m b/YuMi/Modules/YMMessage/View/SessionList/SessionListCell.m index cd9be3b4..d111404d 100644 --- a/YuMi/Modules/YMMessage/View/SessionList/SessionListCell.m +++ b/YuMi/Modules/YMMessage/View/SessionList/SessionListCell.m @@ -132,11 +132,12 @@ make.bottom.mas_equalTo(self); make.height.mas_equalTo(0.5f); }]; + } - (void)layoutSubviews { [super layoutSubviews]; - self.badgeView.nim_right = self.nim_width - 15; + self.badgeView.nim_right = isMSRTL() ? 15 + self.badgeView.mj_w : self.nim_width - 15; self.badgeView.nim_top = 20; } diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItemView.h b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItemView.h deleted file mode 100644 index 18f5f3be..00000000 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItemView.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// YMSessionListHeadItemView.h -// YUMI -// -// Created by YUMI on 2022/11/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface XPSessionListHeadItemView : UIView - -@property (nonatomic, copy) NSString *imageName; -@property (nonatomic, copy) NSString *title; -@property (nonatomic, assign) BOOL showDot; -@property (nonatomic, assign) NSInteger badgeValue; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItemView.m b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItemView.m deleted file mode 100644 index aabd9aeb..00000000 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadItemView.m +++ /dev/null @@ -1,125 +0,0 @@ -// -// YMSessionListHeadItemView.m -// YUMI -// -// Created by YUMI on 2022/11/17. -// - -#import "XPSessionListHeadItemView.h" -#import -#import "DJDKMIMOMColor.h" -#import "NIMBadgeView.h" -#import "UIView+NIM.h" -#import "YUMIMacroUitls.h" - -@interface XPSessionListHeadItemView() - -@property (nonatomic, strong) UILabel *nameLabel; -@property (nonatomic, strong) UIImageView *imageView; -@property (nonatomic, strong) UIView *dotView; -///未读 -@property (nonatomic,strong) NIMBadgeView *badgeView; - -@end - -@implementation XPSessionListHeadItemView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initView]; - [self initContraints]; - } - return self; -} - -- (void)layoutSubviews { - [super layoutSubviews]; - self.badgeView.nim_right = self.imageView.nim_right+2; - self.badgeView.nim_top = self.imageView.nim_top - 6; -} - -- (void)initView { - [self addSubview:self.imageView]; - [self addSubview:self.nameLabel]; - [self addSubview:self.dotView]; - [self addSubview:self.badgeView]; -} - -- (void)initContraints { - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth / 4); - }]; - - [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.centerX.mas_equalTo(0); - make.width.height.mas_equalTo(50); - }]; - [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.bottom.mas_equalTo(0); - make.top.mas_equalTo(self.imageView.mas_bottom).mas_offset(8); - make.bottom.mas_equalTo(0); - make.height.mas_equalTo(17); - }]; - [self.dotView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.trailing.mas_equalTo(self.imageView); - make.width.height.mas_equalTo(12); - }]; -} - -- (void)setTitle:(NSString *)title { - self.nameLabel.text = title; -} - -- (void)setImageName:(NSString *)imageName { - self.imageView.image = [UIImage imageNamed:imageName]; -} -- (void)setShowDot:(BOOL)showDot { - self.dotView.hidden = !showDot; -} - -- (void)setBadgeValue:(NSInteger)badgeValue { - if (badgeValue) { - self.badgeView.hidden = NO; - self.badgeView.badgeValue = @(badgeValue).stringValue; - } else { - self.badgeView.hidden = YES; - } -} - -- (UILabel *)nameLabel { - if (!_nameLabel) { - _nameLabel = [[UILabel alloc] initWithFrame:CGRectZero]; - _nameLabel.backgroundColor = [UIColor clearColor]; - _nameLabel.font = [UIFont systemFontOfSize:14]; - _nameLabel.textColor = DJDKMIMOMColor.mainTextColor; - } - return _nameLabel; -} - -- (UIImageView *)imageView { - if (!_imageView) { - _imageView = [[UIImageView alloc] init]; - } - return _imageView; -} - -- (UIView *)dotView { - if (!_dotView) { - _dotView = [[UIView alloc] init]; - _dotView.layer.cornerRadius = 6; - _dotView.layer.masksToBounds = YES; - _dotView.backgroundColor = UIColorFromRGB(0xFB486A); - _dotView.hidden = YES; - } - return _dotView; -} - -- (NIMBadgeView *)badgeView { - if (!_badgeView) { - _badgeView = [NIMBadgeView viewWithBadgeTip:@""]; - _badgeView.hidden = YES; - } - return _badgeView; -} - -@end diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadView.h b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadView.h deleted file mode 100644 index 6b868726..00000000 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadView.h +++ /dev/null @@ -1,43 +0,0 @@ -// -// YMSessionListHeadView.h -// YUMI -// -// Created by YUMI on 2022/11/17. -// - -#import - -NS_ASSUME_NONNULL_BEGIN -@class SessionSayHelloCountModel; -@protocol XPSessionListHeadViewDelegate - -///点击官方公告 -- (void)XPSessionListHeadViewDidClickOffice; -///点击活动通知 -- (void)XPSessionListHeadViewDidClickActivity; -///点击订阅提醒 -- (void)XPSessionListHeadViewDidClickSubscribe; -///点击发现萌新 -- (void)XPSessionListHeadViewDidClickMengxin; -///点击打招呼 -- (void)XPSessionListHeadViewDidClickSayHello; -@end - -@interface XPSessionListHeadView : UIView - -- (void)updateToolViewWithUserLevel:(NSInteger)level; - -@property (nonatomic, strong) NSArray *friendsArray; -///是否隐藏 打招呼入口和关注的开播的人 -@property (nonatomic,assign) BOOL hiddentTool; -///打招呼信息 -@property (nonatomic,strong) SessionSayHelloCountModel *sayHelloInfo; - -@property (nonatomic, weak) id delegate; - -///更新角标 -- (void)updateBadgeWithSessionId:(NSString *)sessionId unreadCount:(NSInteger)unreadCount; - -@end - -NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadView.m b/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadView.m deleted file mode 100644 index 201c6204..00000000 --- a/YuMi/Modules/YMMessage/View/SessionListHeadView/XPSessionListHeadView.m +++ /dev/null @@ -1,325 +0,0 @@ -// -// YMSessionListHeadView.m -// YUMI -// -// Created by YUMI on 2022/11/17. -// - -#import "XPSessionListHeadView.h" -#import -#import "UIImage+Utils.h" -#import "DJDKMIMOMColor.h" -#import "ClientConfig.h" -#import "UserInfoModel.h" -#import "XPSessionListHeadItem.h" -#import "XPSessionListHeadItemView.h" -#import "XPSessionListHeadFriendCell.h" -#import "NSArray+Safe.h" -#import "XPSessionListFansPartyModel.h" -#import "XCCurrentVCStackManager.h" -#import "XPRoomViewController.h" -#import "XPSessionHelloEnterView.h" -#import "SessionSayHelloCountModel.h" -#import "YUMIMacroUitls.h" - -NSString * const kMengXinShowReadDotKey = @"kMengXinShowReadDotKey"; - -@interface XPSessionListHeadView() - -@property (nonatomic, strong) UIStackView *mainStackView; -///工具条 -@property (nonatomic, strong) UIStackView *toolStackView; -///打招呼和 在线直播 -@property (nonatomic,strong) UIStackView *bottomStackView; -///好友列表 -@property (nonatomic, strong) UICollectionView *collectionView; -///打招呼入口 -@property (nonatomic,strong) XPSessionHelloEnterView *helloView; -///工具item集合 -@property (nonatomic, strong) NSMutableArray *funtionArray; - -@end - -@implementation XPSessionListHeadView - -- (instancetype)initWithFrame:(CGRect)frame { - if (self = [super initWithFrame:frame]) { - [self initItemData]; - [self initView]; - [self initContraints]; - } - return self; -} - -- (void)initItemData { - XPSessionListHeadItem *officeItem = [[XPSessionListHeadItem alloc] init]; - officeItem.title = YMLocalizedString(@"XPSessionListHeadView0"); - officeItem.imageName = @"session_list_head_office"; - officeItem.type = XPSessionListHeadItemType_Office; - - XPSessionListHeadItem *activityItem = [[XPSessionListHeadItem alloc] init]; - activityItem.title = YMLocalizedString(@"XPSessionListHeadView1"); - activityItem.imageName = @"session_list_head_activity"; - activityItem.type = XPSessionListHeadItemType_Activity; - - XPSessionListHeadItem *subscribeItem = [[XPSessionListHeadItem alloc] init]; - subscribeItem.title = YMLocalizedString(@"XPSessionListHeadView2"); - subscribeItem.imageName = @"session_list_head_subscribe"; - subscribeItem.type = XPSessionListHeadItemType_Subscribe; - - [self.funtionArray addObject:officeItem]; - [self.funtionArray addObject:activityItem]; - [self.funtionArray addObject:subscribeItem]; -} - -- (void)initView { - [self addSubview:self.mainStackView]; - [self.mainStackView addArrangedSubview:self.toolStackView]; - [self.mainStackView addArrangedSubview:self.bottomStackView]; - - [self.bottomStackView addArrangedSubview:self.helloView]; - [self.bottomStackView addArrangedSubview:self.collectionView]; - for (XPSessionListHeadItem *item in self.funtionArray) { - XPSessionListHeadItemView *itemView = [[XPSessionListHeadItemView alloc] init]; - itemView.imageName = item.imageName; - itemView.title = item.title; - itemView.showDot = item.showRedDot; - itemView.tag = item.type; - [self.toolStackView addArrangedSubview:itemView]; - UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapItem:)]; - [itemView addGestureRecognizer:tap]; - } - -} - -- (void)initContraints { - [self.mainStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.trailing.top.equalTo(self); - }]; - - [self.toolStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(KScreenWidth); - make.height.mas_equalTo(85); - }]; - - [self.helloView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(93, 90)); - }]; - - [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(90); - make.width.mas_equalTo(0); - }]; - - [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.mas_equalTo(self.mainStackView); - }]; -} - -#pragma mark - UICollectionViewDelegate -- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return self.friendsArray.count; -} - -- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - XPSessionListHeadFriendCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:NSStringFromClass([XPSessionListHeadFriendCell class]) forIndexPath:indexPath]; - XPSessionListFansPartyModel *model = [self.friendsArray safeObjectAtIndex1:indexPath.row]; - [cell configData:model]; - return cell; -} - -- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { - XPSessionListFansPartyModel *model = [self.friendsArray safeObjectAtIndex1:indexPath.row]; - if (model.roomUid.length > 0) { - [XPRoomViewController openRoom:model.roomUid viewController:[XCCurrentVCStackManager shareManager].getCurrentVC]; - } -} - -- (void)updateToolViewWithUserLevel:(NSInteger)level { - if( [ClientConfig shareConfig].configInfo.findNewbieCharmLevel <= level) { -// XPSessionListHeadItem *mengxinItem = [[XPSessionListHeadItem alloc] init]; -// mengxinItem.title = YMLocalizedString(@"XPSessionListHeadView3"); -// mengxinItem.imageName = @"session_list_head_mengxin"; -// mengxinItem.type = XPSessionListHeadItemType_MemgXin; -// [self.funtionArray addObject:mengxinItem]; -// -// XPSessionListHeadItemView *itemView = [[XPSessionListHeadItemView alloc] init]; -// itemView.imageName = mengxinItem.imageName; -// itemView.title = mengxinItem.title; -// BOOL hidden = [[NSUserDefaults standardUserDefaults] boolForKey:kMengXinShowReadDotKey]; -// itemView.showDot = !hidden; -// itemView.tag = mengxinItem.type; -// [self.toolStackView addArrangedSubview:itemView]; -// UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapItem:)]; -// [itemView addGestureRecognizer:tap]; - } -} - -- (void)updateBadgeWithSessionId:(NSString *)sessionId unreadCount:(NSInteger)unreadCount { - for (int i = 0; i<[ClientConfig shareConfig].configInfo.officialMsgUids.count; i++) { - NSString *str = [[ClientConfig shareConfig].configInfo.officialMsgUids safeObjectAtIndex1:i]; - if ([str isEqualToString:sessionId]) { - XPSessionListHeadItemView *itemView = [self.toolStackView.subviews safeObjectAtIndex1:i]; - if (i == 2) { - itemView.showDot = unreadCount; - } else { - itemView.badgeValue = unreadCount; - } - } - } -} - -- (void)tapItem:(UITapGestureRecognizer *)ges { - XPSessionListHeadItemView *view = (XPSessionListHeadItemView *)ges.view; - switch (view.tag) { - case XPSessionListHeadItemType_Office: - { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPSessionListHeadViewDidClickOffice)]) { - [self.delegate XPSessionListHeadViewDidClickOffice]; - } - } - break; - case XPSessionListHeadItemType_Activity: - { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPSessionListHeadViewDidClickActivity)]) { - [self.delegate XPSessionListHeadViewDidClickActivity]; - } - } - break; - case XPSessionListHeadItemType_Subscribe: - { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPSessionListHeadViewDidClickSubscribe)]) { - [self.delegate XPSessionListHeadViewDidClickSubscribe]; - } - } - break; - case XPSessionListHeadItemType_MemgXin: - { - [[NSUserDefaults standardUserDefaults] setBool:YES forKey:kMengXinShowReadDotKey]; - [[NSUserDefaults standardUserDefaults] synchronize]; - XPSessionListHeadItemView *itemView = [self.toolStackView.subviews lastObject]; - itemView.showDot = NO; - if (self.delegate && [self.delegate respondsToSelector:@selector(XPSessionListHeadViewDidClickMengxin)]) { - [self.delegate XPSessionListHeadViewDidClickMengxin]; - } - } - break; - default: - break; - } -} - -- (void)sayHelloRecognizer { - if (self.delegate && [self.delegate respondsToSelector:@selector(XPSessionListHeadViewDidClickSayHello)]) { - [self.delegate XPSessionListHeadViewDidClickSayHello]; - } -} - -- (void)setFriendsArray:(NSArray *)friendsArray { - _friendsArray = friendsArray; - [self.collectionView reloadData]; - if (_friendsArray.count > 0) { - self.collectionView.hidden = NO; - } else { - self.collectionView.hidden = YES; - } -} - -- (void)setSayHelloInfo:(SessionSayHelloCountModel *)sayHelloInfo { - _sayHelloInfo = sayHelloInfo; - if (_sayHelloInfo) { - self.helloView.hidden = !_sayHelloInfo.visible; - self.helloView.number = _sayHelloInfo.helloCount; - } else { - self.helloView.hidden = YES; - } - - CGFloat width = (KScreenWidth); - if (!self.helloView.hidden) { - width = KScreenWidth - 93; - } - - [self.collectionView mas_updateConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(width); - }]; -} - -- (void)setHiddentTool:(BOOL)hiddentTool { - _hiddentTool = hiddentTool; - self.bottomStackView.hidden = _hiddentTool; -} - -- (UIStackView *)mainStackView { - if (!_mainStackView) { - _mainStackView = [[UIStackView alloc] init]; - _mainStackView.axis = UILayoutConstraintAxisVertical; - _mainStackView.distribution = UIStackViewDistributionFill; - _mainStackView.alignment = UIStackViewAlignmentLeading; - _mainStackView.spacing = 32; - } - return _mainStackView; -} - -- (UIStackView *)toolStackView { - if (!_toolStackView) { - _toolStackView = [[UIStackView alloc] init]; - _toolStackView.axis = UILayoutConstraintAxisHorizontal; - _toolStackView.distribution = UIStackViewDistributionFillEqually; - _toolStackView.alignment = UIStackViewAlignmentCenter; - _toolStackView.backgroundColor = [UIColor clearColor]; - } - return _toolStackView; -} - -- (NSMutableArray *)funtionArray { - if (!_funtionArray) { - _funtionArray = [NSMutableArray array]; - } - return _funtionArray; -} - -- (UIStackView *)bottomStackView { - if (!_bottomStackView) { - _bottomStackView = [[UIStackView alloc] init]; - _bottomStackView.axis = UILayoutConstraintAxisHorizontal; - _bottomStackView.distribution = UIStackViewDistributionFill; - _bottomStackView.alignment = UIStackViewAlignmentCenter; - _bottomStackView.spacing = 0; - _bottomStackView.hidden = YES; - } - return _bottomStackView; -} - -- (XPSessionHelloEnterView *)helloView { - if (!_helloView) { - _helloView = [[XPSessionHelloEnterView alloc] init]; - _helloView.number = 20; - _helloView.hidden = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(sayHelloRecognizer)]; - [_helloView addGestureRecognizer:tap]; - } - return _helloView; -} - -- (UICollectionView *)collectionView { - if (!_collectionView) { - MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.scrollDirection = UICollectionViewScrollDirectionHorizontal; - layout.minimumLineSpacing = 18; -// layout.minimumInteritemSpacing = 18; - layout.itemSize = CGSizeMake(60, 90); - layout.sectionInset = UIEdgeInsetsMake(0, 16, 0, 16); - _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; - [_collectionView registerClass:[XPSessionListHeadFriendCell class] forCellWithReuseIdentifier:NSStringFromClass([XPSessionListHeadFriendCell class])]; - _collectionView.delegate = self; - _collectionView.dataSource = self; - _collectionView.backgroundColor = [UIColor clearColor]; - _collectionView.layer.cornerRadius = 8; - _collectionView.layer.masksToBounds = YES; - _collectionView.hidden = YES; - _collectionView.showsHorizontalScrollIndicator = NO; - } - return _collectionView; -} - -@end diff --git a/YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.m b/YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.m index e3b559fe..7f5d09f8 100644 --- a/YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.m +++ b/YuMi/Modules/YMMine/Presenter/XPMineSettingPresent.m @@ -124,7 +124,7 @@ NSArray * oneSection = @[phoneItem]; NSArray * twoSection = @[loginItem,payItem, notificaItem,shieldItem, blackListItem,languageItem]; NSArray * threeSection = @[privacyItem]; - NSArray * fourthSection = @[helperItem, feedbackItem, clearMemoryItem, updateItem, aboutusItem]; + NSArray * fourthSection = @[helperItem, clearMemoryItem, updateItem, aboutusItem]; self.datasouce = @[oneSection, twoSection, threeSection, fourthSection]; }else{ diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m index 9d4e1ccc..a69b636f 100644 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m @@ -238,7 +238,7 @@ -(void)setUserInfo:(UserInfoModel *)userInfo{ _userInfo = userInfo; // _starIconView.hidden = NO; - NSString *dateStr = [NSString stringWithFormat:@"%@",[NSString getCalculateConstellationImageWithMonth:_userInfo.birth]]; +// NSString *dateStr = [NSString stringWithFormat:@"%@",[NSString getCalculateConstellationImageWithMonth:_userInfo.birth]]; // if(dateStr.length > 0){ // _starIconView.image = kImage(dateStr); // } diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.m index f8d89e7b..635707aa 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPMineCarTableViewCell.m @@ -75,6 +75,7 @@ [self.nameStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.mas_equalTo(self.carImageView.mas_trailing).offset(10); + make.trailing.equalTo(self.useButton.mas_leading).mas_offset(-kGetScaleWidth(5)); make.bottom.mas_equalTo(self.carImageView.mas_centerY).offset(-3); }]; @@ -181,6 +182,7 @@ _titleLabel = [[UILabel alloc] init]; _titleLabel.font = [UIFont systemFontOfSize:15]; _titleLabel.textColor = [DJDKMIMOMColor mainTextColor]; + _timeLabel.numberOfLines = 2; } return _titleLabel; } diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m b/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m index 800ddf12..afcbe4ce 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/XPDressUpShopViewController.m @@ -332,6 +332,11 @@ _pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; _pi_BannerView.layer.masksToBounds = YES; _pi_BannerView.layer.cornerRadius = 12; + // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 + _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + for (UIView *subView in _pi_BannerView.subviews) { + subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + } } return _pi_BannerView; } diff --git a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpViewController.m b/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpViewController.m index 5015111e..c529f442 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpViewController.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/XPMineDressUpViewController.m @@ -246,6 +246,11 @@ _pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; _pi_BannerView.layer.masksToBounds = YES; _pi_BannerView.layer.cornerRadius = 12; + // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 + _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + for (UIView *subView in _pi_BannerView.subviews) { + subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + } } return _pi_BannerView; } diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.m index 48d7a2a7..8c0fe97e 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/Cell/XPMineConfirmGiveDiamondView.m @@ -121,7 +121,7 @@ if(_type == 2){ NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc]initWithString:@(_inputDiamonds).stringValue attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:kGetScaleWidth(30) weight:UIFontWeightMedium],NSForegroundColorAttributeName:[DJDKMIMOMColor inputTextColor]}]; NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; - UIImage *iconImage = [UIImage imageNamed:@"mine_give_diamone_icon"];; + UIImage *iconImage = [UIImage imageNamed:@"exchange_gold_icon"];; attachment.bounds = CGRectMake(0, roundf(self.numView.font.capHeight - 24)/2.f, 24, 24); attachment.image =iconImage; NSAttributedString * starAttribute = [NSMutableAttributedString attributedStringWithAttachment:(NSTextAttachment *)attachment]; diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.m index b6fd89e2..9c1945f4 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPIncomeRecordGoldDetailsHeadView.m @@ -387,14 +387,17 @@ [self addSubview:self.clickBtn]; } - (void)initSubViewConstraints { + [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.equalTo(self.mas_centerX).mas_offset(-kGetScaleWidth(5.5)); + make.leading.mas_equalTo(0); + make.trailing.mas_equalTo(-kGetScaleWidth(15)); make.centerY.equalTo(self); - make.height.mas_equalTo(kGetScaleWidth(17)); + }]; + [self.downBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.equalTo(self.titleView.mas_trailing).mas_offset(kGetScaleWidth(3)); - make.top.equalTo(self.titleView.mas_top).mas_offset(kGetScaleWidth(4)); + make.centerY.equalTo(self.mas_centerY).mas_offset(-kGetScaleWidth(4)); make.width.mas_equalTo(kGetScaleWidth(8)); make.height.mas_equalTo(kGetScaleWidth(4)); }]; @@ -420,6 +423,8 @@ _titleView.font = [UIFont systemFontOfSize:12 weight:UIFontWeightMedium]; _titleView.textColor = [DJDKMIMOMColor inputTextColor]; _titleView.text = YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView5"); + _titleView.numberOfLines = 2; + _titleView.textAlignment = NSTextAlignmentCenter; } return _titleView; } diff --git a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.m b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.m index 2593eb8d..ae2c8022 100644 --- a/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.m +++ b/YuMi/Modules/YMMine/View/GiveDiamond/View/XPMineGiveDiamondVC.m @@ -117,7 +117,7 @@ if(self.datasource.count < indexPath.row)return; XPMineGiveDiamondDetailsVC *vc = [[XPMineGiveDiamondDetailsVC alloc]init]; vc.userInfo = self.userInfo; - XPMineGiveDiamondModel *model = self.datasource[indexPath.row]; + XPMineGiveDiamondModel *model = [self.datasource safeObjectAtIndex1:indexPath.row]; vc.toUid = model.targetUid; [self.navigationController pushViewController:vc animated:YES]; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.m index 50867157..8f240c92 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/SuperAdmin/XPGuildSearchSuperAdminTableViewCell.m @@ -173,6 +173,8 @@ [_superAdminButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor], [DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake(10, 10)] forState:UIControlStateNormal]; _superAdminButton.layer.masksToBounds = YES; _superAdminButton.layer.cornerRadius = 15; + _superAdminButton.titleLabel.numberOfLines = 2; + _superAdminButton.titleLabel.textAlignment = NSTextAlignmentCenter; [_superAdminButton addTarget:self action:@selector(superAdminButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } return _superAdminButton; diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanMenuView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanMenuView.m index e1687325..fa59a01a 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanMenuView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPClanMenuView.m @@ -75,6 +75,7 @@ _titleLabel.font = [UIFont systemFontOfSize:15 weight:UIFontWeightMedium]; _titleLabel.textColor = [UIColor whiteColor]; _titleLabel.textAlignment = NSTextAlignmentCenter; + _titleLabel.numberOfLines = 2; } return _titleLabel; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.m index 16f2e784..34d1b06a 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGoldIncomeSectionView.m @@ -70,7 +70,8 @@ make.centerY.height.equalTo(self.roomView); }]; [self.exchangeGoldView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.width.height.equalTo(self.settlementView); + make.width.equalTo(self.settlementView); + make.centerY.equalTo(self); make.trailing.equalTo(self.settlementView.mas_leading); }]; [self.diamondView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -152,6 +153,7 @@ if (!_exchangeGoldView){ _exchangeGoldView = [UILabel labelInitWithText:YMLocalizedString(@"XPIncomeRecordGoldDetailsHeadView3") font:kFontMedium(12) textColor:[DJDKMIMOMColor inputTextColor]]; _exchangeGoldView.textAlignment = NSTextAlignmentCenter; + _exchangeGoldView.numberOfLines = 2; } return _exchangeGoldView; diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m index 51eb303f..acbd882c 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPGuildTimePickView.m @@ -100,7 +100,7 @@ make.top.mas_equalTo(self.toolView); make.leading.mas_equalTo(self.toolView).mas_offset(8); make.height.mas_equalTo(30); - make.width.mas_equalTo(50); + }]; [self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) { make.trailing.mas_equalTo(self.toolView).mas_offset(-8); diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.m index eb7fb372..3620300a 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPMineGuildPersonalBillRecordItemView.m @@ -30,7 +30,7 @@ -(void)installConstraints{ [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(-kGetScaleWidth(8)); - make.centerX.equalTo(self); + make.leading.trailing.equalTo(self); }]; [self.numView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.trailing.equalTo(self).inset(kGetScaleWidth(5)); @@ -59,6 +59,7 @@ if(!_titleView){ _titleView = [UILabel labelInitWithText:@"" font:kFontRegular(11) textColor:UIColorFromRGB(0x696D7A)]; _titleView.textAlignment = NSTextAlignmentCenter; + _titleView.numberOfLines = 2; } return _titleView; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.m index 64c12bd2..ffa7bf4e 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildIncomeHeaderView.m @@ -48,6 +48,7 @@ [self.formatter setDateFormat:YMLocalizedString(@"App_Common_Year")]; NSString *currentYear = [self.formatter stringFromDate:startDate]; self.yearLabel.text = currentYear; + if (self.timeType == NewGuildIncomeRecrdTimeType_Day) { [self.formatter setDateFormat:YMLocalizedString(@"XPGuildIncomeHeaderView0")]; NSString * currentDay = [self.formatter stringFromDate:startDate]; diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m index a89fed81..3bbe691c 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewGuildTimePickView.m @@ -136,11 +136,11 @@ make.top.mas_equalTo(20); make.leading.mas_equalTo(self.toolView).mas_offset(15); make.height.mas_equalTo(19); - make.width.mas_equalTo(35); + }]; [self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) { make.trailing.mas_equalTo(self.toolView).mas_offset(-15); - make.width.height.centerY.mas_equalTo(self.cancleButton); + make.height.centerY.mas_equalTo(self.cancleButton); }]; [self.dayBtn mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewMineGuildItemView.m b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewMineGuildItemView.m index 3f9be92a..1b262d05 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewMineGuildItemView.m +++ b/YuMi/Modules/YMMine/View/Guild/View/SubViews/XPNewMineGuildItemView.m @@ -34,7 +34,7 @@ } - (void)setBgImage:(UIImage *)bgImage{ _bgImage = bgImage; - _iconView.image = _bgImage; + _iconView.image = [_bgImage ms_SetImageForRTL]; } - (void)setText:(NSString *)text{ _text = text; diff --git a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.m b/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.m index 31af7149..06d916ab 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.m +++ b/YuMi/Modules/YMMine/View/Guild/View/XPMineGuildViewController.m @@ -725,6 +725,7 @@ UIKIT_EXTERN NSString *kInviteMemeberSuccess; _exitButton.titleLabel.font = [UIFont systemFontOfSize:16]; _exitButton.hidden = YES; [_exitButton addTarget:self action:@selector(exitButtonAction:) forControlEvents:UIControlEventTouchUpInside]; + [_exitButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; } return _exitButton; } @@ -736,6 +737,7 @@ UIKIT_EXTERN NSString *kInviteMemeberSuccess; [_editButton setImage:[UIImage imageNamed:@"mine_guild_guild_edit"] forState:UIControlStateSelected]; [_editButton addTarget:self action:@selector(editButtonAction:) forControlEvents:UIControlEventTouchUpInside]; _editButton.hidden = YES; + [_editButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; } return _editButton; } diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.m index aee4e047..41028c5a 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.m +++ b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterTitleCell.m @@ -46,7 +46,7 @@ - (UIImageView *)bgImageView{ if(!_bgImageView){ _bgImageView = [UIImageView new]; - _bgImageView.image = kImage(@"mine_noble_center_tag_title_bg"); + _bgImageView.image = [UIImage getLanguageImage:@"mine_noble_center_tag_title_bg"]; _bgImageView.hidden = YES; } return _bgImageView; diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.m index 7a66fbfc..80be6510 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.m +++ b/YuMi/Modules/YMMine/View/Noble/View/SubViews/XPNobleCenterTableHeadView.m @@ -148,7 +148,7 @@ - (UIImageView *)myLevelImageView { if (!_myLevelImageView) { - _myLevelImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"noble_myLevel_head"]]; + _myLevelImageView = [[UIImageView alloc] initWithImage:[UIImage getLanguageImage:@"noble_myLevel_head"]]; _myLevelImageView.contentMode = UIViewContentModeScaleAspectFit; _myLevelImageView.hidden = YES; } diff --git a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m b/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m index 9691d646..e0c40a8d 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m +++ b/YuMi/Modules/YMMine/View/Noble/View/XPNobleCenterViewController.m @@ -767,7 +767,7 @@ - (UIButton *)rankBtn{ if(!_rankBtn){ _rankBtn = [UIButton new]; - [_rankBtn setBackgroundImage:kImage(@"mine_noble_center_rank") forState:UIControlStateNormal]; + [_rankBtn setBackgroundImage:[UIImage getLanguageImage:@"mine_noble_center_rank"] forState:UIControlStateNormal]; [_rankBtn addTarget:self action:@selector(rankAction) forControlEvents:UIControlEventTouchUpInside]; } return _rankBtn; diff --git a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeadCell.m b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeadCell.m index 69bb6832..ad957925 100644 --- a/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeadCell.m +++ b/YuMi/Modules/YMMine/View/Recharge/XPIAPRechargeHeadCell.m @@ -64,7 +64,11 @@ _pi_BannerView.pageControlDotSize = CGSizeMake(kGetScaleWidth(4), kGetScaleWidth(4)); _pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; _pi_BannerView.placeholderImage = [UIImageConstant defalutBannerPlaceholder]; - + // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 + _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + for (UIView *subView in _pi_BannerView.subviews) { + subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + } } return _pi_BannerView; } diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m index 69cfad74..130c682b 100644 --- a/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m +++ b/YuMi/Modules/YMMine/View/Setting/XPMineSettingViewController.m @@ -78,15 +78,14 @@ -(void)setNavVeiw{ UIBarButtonItem *leftBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"common_nav_back"]ms_SetImageForRTL] style:UIBarButtonItemStyleDone target:self action:@selector(backClick)]; leftBarButtonItem.tintColor = [DJDKMIMOMColor mainTextColor]; - self.navigationItem.rightBarButtonItem = nil; - self.navigationItem.leftBarButtonItem = nil; self.navigationItem.leftBarButtonItem = leftBarButtonItem; } -(void)switchLanguage:(NSNotification *)not{ for (UIView *obj in self.view.subviews) { [obj removeFromSuperview]; } - + self.navigationItem.rightBarButtonItem = nil; + self.navigationItem.leftBarButtonItem = nil; [self.presenter clearList]; self.tableView = nil; self.datasource = nil; diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m index 0b06b425..64fa9388 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m @@ -864,6 +864,11 @@ _pi_cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; _pi_cycleScrollView.pageControlStyle = SDCycleScrollViewPageContolStyleNone; _pi_cycleScrollView.autoScroll = NO; + // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 + _pi_cycleScrollView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + for (UIView *subView in _pi_cycleScrollView.subviews) { + subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + } } return _pi_cycleScrollView; } @@ -962,7 +967,7 @@ if (!_newUserImageView) { _newUserImageView = [[UIImageView alloc] init]; _newUserImageView.userInteractionEnabled = YES; - _newUserImageView.image = [UIImage imageNamed:@"common_new_user"]; + _newUserImageView.image = [UIImage getLanguageImage:@"common_new_user"]; _newUserImageView.hidden = YES; } return _newUserImageView; @@ -1115,7 +1120,7 @@ - (NetImageView *)rechargeImageView{ if(!_rechargeImageView){ _rechargeImageView = [NetImageView new]; - _rechargeImageView.image = kImage(@"mine_info_recharge"); + _rechargeImageView.image = [UIImage getLanguageImage:@"mine_info_recharge"]; _rechargeImageView.hidden = YES; } return _rechargeImageView; diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m index 5491cacb..6d0a2c79 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m +++ b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m @@ -399,12 +399,12 @@ } - NSString *starImage = [NSString - getCalculateConstellationImageWithMonth:_userInfo.birth]; - if(starImage.length > 0){ - self.starVeiw.image = kImage(starImage); - } - +// NSString *starImage = [NSString +// getCalculateConstellationImageWithMonth:_userInfo.birth]; +// if(starImage.length > 0){ +// self.starVeiw.image = kImage(starImage); +// } +// [self.sexImageView setTitle:[NSString getAgeWithBirth:userInfo.birth] forState:UIControlStateNormal]; self.sexImageView.hidden = NO; diff --git a/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m b/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m index b96346ec..43a194ee 100644 --- a/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m +++ b/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m @@ -66,7 +66,7 @@ static NSString *lastSelectTab = @"lastSelectTab"; [super viewDidLoad]; [self initSubViews]; [self initSubViewConstraints]; - [self addNavigationItemWithItems:@[self.managerBtn] isLeft:NO]; +// [self addNavigationItemWithItems:@[self.managerBtn] isLeft:NO]; [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventcollection_editbutton_show]; } diff --git a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m index d4eea1f6..c715a1f3 100644 --- a/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m +++ b/YuMi/Modules/YMMonents/View/SubViews/XPMonentsUserInfoView.m @@ -441,7 +441,7 @@ if (!_newsUserImageView) { _newsUserImageView = [[UIImageView alloc] init]; _newsUserImageView.userInteractionEnabled = YES; - _newsUserImageView.image = [UIImage imageNamed:@"common_new_user"]; + _newsUserImageView.image = [UIImage getLanguageImage:@"common_new_user"]; _newsUserImageView.hidden = YES; } return _newsUserImageView; diff --git a/YuMi/Modules/YMNewHome/Api/Api+Home.h b/YuMi/Modules/YMNewHome/Api/Api+Home.h index b4363ce2..ab2d454b 100644 --- a/YuMi/Modules/YMNewHome/Api/Api+Home.h +++ b/YuMi/Modules/YMNewHome/Api/Api+Home.h @@ -86,10 +86,7 @@ NS_ASSUME_NONNULL_BEGIN /// @param pageSize 一页多少个 + (void)homePlayGameTeam:(HttpRequestHelperCompletion)completion uid:(NSString *)uid pageNum:(NSString *)pageNum pageSize:(NSString *)pageSize; -/// 请求首页关注列表 -/// @param completion 完成 -/// @param uid 用户的uid -+ (void)homeAttentionList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid; + /// 请求收藏房间列表 /// @param completion 完成 diff --git a/YuMi/Modules/YMNewHome/Api/Api+Home.m b/YuMi/Modules/YMNewHome/Api/Api+Home.m index 2f2e29da..f66e7d8c 100644 --- a/YuMi/Modules/YMNewHome/Api/Api+Home.m +++ b/YuMi/Modules/YMNewHome/Api/Api+Home.m @@ -101,12 +101,7 @@ [self makeRequest:@"home/playV2" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,uid , pageNum, pageSize,nil]; } -/// 请求首页关注列表 -/// @param completion 完成 -/// @param uid 用户的uid -+ (void)homeAttentionList:(HttpRequestHelperCompletion)completion uid:(NSString *)uid { - [self makeRequest:@"fans/partTabFollowList" method:HttpRequestHelperMethodGET completion:completion, __FUNCTION__,uid ,nil]; -} + /// 请求收藏房间列表 /// @param completion 完成 diff --git a/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h b/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h index 01e6d54a..73d1f79b 100644 --- a/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h +++ b/YuMi/Modules/YMNewHome/Model/HomePlayRoomModel.h @@ -65,6 +65,7 @@ NS_ASSUME_NONNULL_BEGIN @property(nonatomic,assign) long birth; ///昵称 @property(nonatomic,copy) NSString *nick; +@property(nonatomic,copy) NSString *introduction; @property(nonatomic,strong) UserLevelVo *userLevelVo; @end diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.m index 8c68cd9f..cb2339af 100644 --- a/YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Cell/XPHomeBannerTableViewCell.m @@ -84,6 +84,11 @@ _pi_BannerView.autoScrollTimeInterval = 5.0; _pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; _pi_BannerView.placeholderImage = [UIImageConstant defalutBannerPlaceholder]; + // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 + _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + for (UIView *subView in _pi_BannerView.subviews) { + subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + } } return _pi_BannerView; } diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m index 9ba37763..4690afa2 100644 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyCollectionViewCell.m @@ -10,21 +10,21 @@ #import @interface XPNewHomePartyCollectionViewCell() ///背景 -@property(nonatomic,strong) NetImageView *bgImageView; -///阴影 -@property(nonatomic,strong) UIImageView *shadowBgView; +@property(nonatomic,strong) NetImageView *avatarView; + ///榜单 -@property(nonatomic,strong) UIImageView *rankImageView; +@property(nonatomic,strong) NetImageView *rankImageView; ///类型 -@property(nonatomic,strong) NetImageView *tagBgImageView; +@property(nonatomic,strong) NetImageView *tagavatarView; ///房间名 @property(nonatomic,strong) UILabel *nameView; +@property(nonatomic,strong) UILabel *subView; ///热度 @property(nonatomic,strong) UILabel *heatView; ///热度波浪 -@property(nonatomic,strong) FLAnimatedImageView *heatGifView; +@property(nonatomic,strong) UIImageView *heatGifView; ///pk @property(nonatomic,strong) SVGAParser *parser; @property(nonatomic,strong) SVGAImageView *pkImageView; @@ -40,31 +40,34 @@ config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; NetImageView *iconView = [[NetImageView alloc]initWithConfig:config]; iconView.tag = 100 + i; - iconView.layer.cornerRadius = kGetScaleWidth(18)/2; + iconView.layer.cornerRadius = kGetScaleWidth(20)/2; iconView.layer.masksToBounds = YES; iconView.layer.borderWidth = 1; iconView.layer.borderColor = [UIColor whiteColor].CGColor; iconView.hidden = YES; - [self.bgImageView addSubview:iconView]; - CGFloat left = kGetScaleWidth(8) + i * kGetScaleWidth(12); + [self.avatarView addSubview:iconView]; + CGFloat left = kGetScaleWidth(90) + i * kGetScaleWidth(116); [iconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.equalTo(self.nameView.mas_top).mas_offset(-kGetScaleWidth(2)); + make.bottom.equalTo(self.nameView.mas_top).mas_offset(-kGetScaleWidth(10)); make.leading.mas_equalTo(left); - make.width.height.mas_equalTo(kGetScaleWidth(18)); + make.width.height.mas_equalTo(kGetScaleWidth(20)); }]; } } return self; } -(void)installUI{ - [self.contentView addSubview:self.bgImageView]; - [self.bgImageView addSubview:self.shadowBgView]; + self.contentView.backgroundColor = [UIColor whiteColor]; + self.contentView.layer.cornerRadius = kGetScaleWidth(10); + self.contentView.layer.masksToBounds = YES; + [self.contentView addSubview:self.avatarView]; + [self.contentView addSubview:self.tagavatarView]; [self.contentView addSubview:self.rankImageView]; - [self.bgImageView addSubview:self.tagBgImageView]; - [self.bgImageView addSubview:self.pkImageView]; - [self.bgImageView addSubview:self.nameView]; - [self.bgImageView addSubview:self.heatGifView]; - [self.bgImageView addSubview:self.heatView]; + + [self.avatarView addSubview:self.pkImageView]; + [self.contentView addSubview:self.nameView]; + [self.contentView addSubview:self.heatGifView]; + [self.contentView addSubview:self.heatView]; @kWeakify(self); [self.parser parseWithNamed:@"pi_home_new_pk" inBundle:nil completionBlock:^(SVGAVideoEntity * _Nonnull videoItem) { @@ -77,77 +80,74 @@ }]; } -(void)installConstraints{ - [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(170)); - make.height.mas_equalTo(kGetScaleWidth(174)); - make.center.equalTo(self.contentView); - }]; - [self.shadowBgView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.bgImageView); + [self.avatarView mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.mas_equalTo(kGetScaleWidth(72)); + make.height.mas_equalTo(kGetScaleWidth(72)); + make.leading.mas_equalTo(kGetScaleWidth(10)); + make.top.mas_equalTo(kGetScaleWidth(10)); }]; + [self.rankImageView mas_makeConstraints:^(MASConstraintMaker *make) { - - make.top.leading.equalTo(self.contentView); - make.width.mas_equalTo(kGetScaleWidth(174)); - make.height.mas_equalTo(kGetScaleWidth(178)); + make.edges.equalTo(self.contentView); }]; - [self.tagBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.leading.mas_equalTo(kGetScaleWidth(6)); - make.width.mas_equalTo(kGetScaleWidth(46)); - make.height.mas_equalTo(kGetScaleWidth(20)); + [self.tagavatarView mas_makeConstraints:^(MASConstraintMaker *make) { + make.top.trailing.mas_equalTo(0); + make.width.mas_equalTo(kGetScaleWidth(62)); + make.height.mas_equalTo(kGetScaleWidth(19)); }]; [self.heatView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(12)); - make.bottom.mas_equalTo(-kGetScaleWidth(12)); - make.height.mas_equalTo(kGetScaleWidth(12)); - make.width.mas_equalTo(kGetScaleWidth(17)); + make.trailing.mas_equalTo(-kGetScaleWidth(8)); + make.bottom.mas_equalTo(-kGetScaleWidth(10)); + make.height.mas_equalTo(kGetScaleWidth(17)); + }]; [self.heatGifView mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(10)); - make.height.mas_equalTo(kGetScaleWidth(9)); - make.trailing.equalTo(self.heatView.mas_leading).mas_offset(-kGetScaleWidth(2)); + make.width.mas_equalTo(kGetScaleWidth(14)); + make.height.mas_equalTo(kGetScaleWidth(14)); + make.trailing.equalTo(self.heatView.mas_leading).mas_offset(-kGetScaleWidth(7)); make.centerY.equalTo(self.heatView); }]; [self.nameView mas_makeConstraints:^(MASConstraintMaker *make) { - make.leading.mas_equalTo(kGetScaleWidth(8)); - make.bottom.mas_equalTo(-kGetScaleWidth(10)); - make.trailing.equalTo(self.heatGifView.mas_leading).mas_equalTo(0); - make.height.mas_equalTo(kGetScaleWidth(20)); + make.leading.mas_equalTo(kGetScaleWidth(90)); + make.top.mas_equalTo(kGetScaleWidth(10)); + make.trailing.equalTo(self.tagavatarView.mas_leading).mas_equalTo(5); + make.height.mas_equalTo(kGetScaleWidth(22)); }]; [self.pkImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(23)); make.height.mas_equalTo(kGetScaleWidth(22)); - make.trailing.mas_equalTo(-kGetScaleWidth(12)); - make.bottom.equalTo(self.bgImageView.mas_bottom).mas_offset(-kGetScaleWidth(30)); + make.trailing.mas_equalTo(-kGetScaleWidth(6)); + make.bottom.equalTo(self.avatarView.mas_bottom).mas_offset(-kGetScaleWidth(6)); }]; } - (void)setRoomInfo:(HomePlayRoomModel *)roomInfo{ _roomInfo = roomInfo; _nameView.text = _roomInfo.title; - _bgImageView.image = nil; + _avatarView.image = nil; @kWeakify(self); - [self.bgImageView loadImageWithUrl:_roomInfo.avatar completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { + [self.avatarView loadImageWithUrl:_roomInfo.avatar completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { @kStrongify(self); - self.bgImageView.image = image; + self.avatarView.image = image; }]; - _tagBgImageView.imageUrl = _roomInfo.tagPict; + _tagavatarView.imageUrl = _roomInfo.tagPict; + _subView.text = _roomInfo.introduction; _heatView.text = @(_roomInfo.onlineNum).stringValue; _rankImageView.image = nil; _pkImageView.hidden = !_roomInfo.crossPking; if(_roomInfo.isHourTop1 == YES){ - _rankImageView.image = kImage(@"home_hour_no_1"); + _rankImageView.image = [UIImage getLanguageImage:@"home_hour_no_1"]; }else{ if(_roomInfo.isWeekTop1 == YES){ - _rankImageView.image = kImage(@"home_week_no_1"); + _rankImageView.image = [UIImage getLanguageImage:@"home_week_no_1"]; ; } } - + for (int i = 0; i < 5; i++) { - NetImageView *iconView = [self.bgImageView viewWithTag:100 + i]; + NetImageView *iconView = [self.avatarView viewWithTag:100 + i]; if(i < _roomInfo.micUsers.count){ iconView.hidden = NO; HomePlayMicUserModel *playModel = _roomInfo.micUsers[i]; @@ -161,57 +161,49 @@ }]; } #pragma mark - 懒加载 -- (NetImageView *)bgImageView{ - if(!_bgImageView){ +- (NetImageView *)avatarView{ + if(!_avatarView){ NetImageConfig *config = [[NetImageConfig alloc]init]; config.placeHolder = [UIImageConstant defaultEmptyAvatarPlaceholder]; - _bgImageView = [[NetImageView alloc]initWithConfig:config]; - [_bgImageView setCornerWithLeftTopCorner:kGetScaleWidth(16) rightTopCorner:kGetScaleWidth(16) bottomLeftCorner:kGetScaleWidth(16) bottomRightCorner:kGetScaleWidth(16) size:CGSizeMake(kGetScaleWidth(170), kGetScaleWidth(174))]; + _avatarView = [[NetImageView alloc]initWithConfig:config]; + [_avatarView setCornerWithLeftTopCorner:kGetScaleWidth(10) rightTopCorner:kGetScaleWidth(10) bottomLeftCorner:kGetScaleWidth(10) bottomRightCorner:kGetScaleWidth(10) size:CGSizeMake(kGetScaleWidth(72), kGetScaleWidth(72))]; } - return _bgImageView; + return _avatarView; } -- (UIImageView *)rankImageView{ +- (NetImageView *)rankImageView{ if(!_rankImageView){ - _rankImageView = [UIImageView new]; + _rankImageView = [NetImageView new]; } return _rankImageView; } -- (NetImageView *)tagBgImageView{ - if(!_tagBgImageView){ - _tagBgImageView = [NetImageView new]; +- (NetImageView *)tagavatarView{ + if(!_tagavatarView){ + _tagavatarView = [NetImageView new]; } - return _tagBgImageView; + return _tagavatarView; } - (UILabel *)nameView{ if(!_nameView){ - _nameView = [UILabel labelInitWithText:@"" font:kFontMedium(14) textColor:[UIColor whiteColor]]; + _nameView = [UILabel labelInitWithText:@"" font:kFontMedium(15) textColor:UIColorFromRGB(0x1E1E1F)]; } return _nameView; } -(UILabel *)heatView{ if(!_heatView){ - _heatView = [UILabel labelInitWithText:@"0" font:kFontBold(10) textColor:[UIColor whiteColor]]; + _heatView = [UILabel labelInitWithText:@"0" font:kFontMedium(10) textColor:UIColorFromRGB(0x84868A)]; _heatView.textAlignment = NSTextAlignmentRight; } return _heatView; } -- (FLAnimatedImageView *)heatGifView{ +- (UIImageView *)heatGifView{ if(!_heatGifView){ - _heatGifView = [FLAnimatedImageView new]; - NSData *localData = [NSData dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"home_heat.gif" ofType:nil]]; - FLAnimatedImage *animatedImage = [FLAnimatedImage animatedImageWithGIFData:localData]; - _heatGifView.animatedImage = animatedImage; + _heatGifView = [UIImageView new]; + _heatGifView.image = kImage(@"ms_home_heat_icon"); } return _heatGifView; } -- (UIImageView *)shadowBgView{ - if(!_shadowBgView){ - _shadowBgView = [UIImageView new]; - _shadowBgView.image = kImage(@"home_friend_shadow_bg"); - } - return _shadowBgView; -} + - (SVGAParser *)parser{ if(!_parser){ _parser = [SVGAParser new]; @@ -227,4 +219,10 @@ } return _pkImageView; } +- (UILabel *)subView{ + if(!_subView){ + + } + return _subView; +} @end diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m index 3eec916f..8aaa26af 100644 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m @@ -335,7 +335,7 @@ - (UIImageView *)gameIconView{ if(!_gameIconView){ _gameIconView = [UIImageView new]; - _gameIconView.image = kImage(@"home_palying_icon"); + _gameIconView.image = [UIImage getLanguageImage:@"home_palying_icon"]; } return _gameIconView; } diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.m index 613210fe..0dbe10ff 100644 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePlayItemCollectionViewCell.m @@ -148,7 +148,7 @@ - (UIImageView *)gameIconView{ if(!_gameIconView){ _gameIconView = [UIImageView new]; - _gameIconView.image = kImage(@"_home_game_icon"); + _gameIconView.image = [UIImage getLanguageImage:@"_home_game_icon"]; } return _gameIconView; } diff --git a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m index e90bc650..5ad678ba 100644 --- a/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m +++ b/YuMi/Modules/YMNewHome/View/CustomView/XPNewHomeHeadView.m @@ -145,6 +145,11 @@ _pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFill; _pi_BannerView.tag = 9000001; _pi_BannerView.hidden = YES; + // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 + _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + for (UIView *subView in _pi_BannerView.subviews) { + subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + } } return _pi_BannerView; } diff --git a/YuMi/Modules/YMNewHome/View/XPHomePartyViewController.m b/YuMi/Modules/YMNewHome/View/XPHomePartyViewController.m index a6912fa9..3ca4354a 100644 --- a/YuMi/Modules/YMNewHome/View/XPHomePartyViewController.m +++ b/YuMi/Modules/YMNewHome/View/XPHomePartyViewController.m @@ -63,7 +63,8 @@ - (void)initSubViewConstraints { [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.view); + make.top.mas_equalTo(kGetScaleWidth(10)); + make.leading.trailing.bottom.equalTo(self.view); }]; MJRefreshBackNormalFooter *footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(fooderRefresh)]; footer.stateLabel.textColor = [DJDKMIMOMColor secondTextColor]; @@ -116,7 +117,7 @@ - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath{ if(self.datasource.count == 0)return self.collectionView.frame.size; - return CGSizeMake(kGetScaleWidth(174), kGetScaleWidth(178)); + return CGSizeMake(kGetScaleWidth(345), kGetScaleWidth(92)); } -(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{ @@ -196,9 +197,9 @@ - (UICollectionView *)collectionView{ if (!_collectionView) { MSBaseRTLFlowLayout *layout = [[MSBaseRTLFlowLayout alloc] init]; - layout.minimumInteritemSpacing = kGetScaleWidth(6); - layout.minimumLineSpacing = kGetScaleWidth(6); - layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(10), 0, kGetScaleWidth(10)); + layout.minimumInteritemSpacing = kGetScaleWidth(0); + layout.minimumLineSpacing = kGetScaleWidth(10); + layout.sectionInset = UIEdgeInsetsMake(0, kGetScaleWidth(15), 0, kGetScaleWidth(15)); _collectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout]; _collectionView.backgroundColor = [UIColor clearColor]; _collectionView.dataSource = self; diff --git a/YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m b/YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m index 61171c84..b674bd9c 100644 --- a/YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m +++ b/YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m @@ -106,6 +106,7 @@ UIKIT_EXTERN NSString * const kShieldingNotification; #pragma mark - InitHttp -(void)requestData{ + return; ///正在播放声音，不能刷新数据 if(self.pi_playAudioCell != nil){ if(self.refreshComplete){ diff --git a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m index b7ecce29..af952485 100644 --- a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m +++ b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m @@ -68,7 +68,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; ///分页标题 @property (nonatomic, strong) NSMutableArray *tagModelList; ///分页控件 -@property (nonatomic, strong) PIHoemCategoryTitleView *titleView; +@property (nonatomic, strong) JXCategoryTitleView *titleView; ///分页lineView @property (nonatomic, strong) JXPagerView *pagingView; @@ -202,12 +202,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; [self.pagingView.mainTableView.mj_header endRefreshing]; }; - self.titleView.scrolledHandle = ^(NSInteger type) { - @kStrongify(self); - [self.titleView.listContainer didClickSelectedItemAtIndex:type]; - self.pagingView.listContainerView.scrollView.contentOffset = CGPointMake(type * KScreenWidth, 0); - self.type = type; - }; + [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(homeVCRefreshComplete) name:@"khomeVCRefreshComplete" object:nil]; [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(logOut) name:@"kInLoginVC" object:nil]; @@ -354,7 +349,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; return self.headView; } - (NSUInteger)heightForPinSectionHeaderInPagerView:(JXPagerView *)pagerView { - return kGetScaleWidth(44); + return kGetScaleWidth(50); } - (UIView *)viewForPinSectionHeaderInPagerView:(JXPagerView *)pagerView { return self.titleView; @@ -402,6 +397,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; if(otherGestureRecognizer.view.tag == 9000002){ return NO; } + if(otherGestureRecognizer.view.tag == 98777){ return NO; } @@ -433,10 +429,10 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; } } self.tagModelList = list; - self.titleView.titleList = self.tagModelList; + self.titleView.titles = titleArray; [self.titleView reloadData]; - self.titleView.index = 0; + } - (void)homeChatPickSuccess:(NSString *)uid { /// 跳聊天 @@ -452,7 +448,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; - (void)categoryView:(JXCategoryBaseView *)categoryView didSelectedItemAtIndex:(NSInteger)index{ - self.titleView.index = index; + self.type = index; } @@ -532,31 +528,30 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; } #pragma mark - Getters And Setters -- (PIHoemCategoryTitleView *)titleView { +- (JXCategoryTitleView *)titleView { if (!_titleView) { - _titleView = [[PIHoemCategoryTitleView alloc] initWithFrame:CGRectZero]; + _titleView = [[JXCategoryTitleView alloc] initWithFrame:CGRectZero]; _titleView.delegate = self; _titleView.titles = @[]; - _titleView.titleList = [@[]mutableCopy]; _titleView.backgroundColor = [UIColor clearColor]; - _titleView.titleColor = [UIColor clearColor]; - _titleView.titleSelectedColor = [UIColor clearColor]; - _titleView.titleFont = kFontSemibold(16); - _titleView.titleSelectedFont = kFontRegular(14); + _titleView.titleColor = UIColorFromRGB(0x767585); + _titleView.titleSelectedColor = UIColorFromRGB(0x1E1E1F); + _titleView.titleFont = kFontRegular(14); + _titleView.titleSelectedFont = kFontSemibold(16); _titleView.titleLabelAnchorPointStyle = JXCategoryTitleLabelAnchorPointStyleCenter; _titleView.contentScrollViewClickTransitionAnimationEnabled = NO; _titleView.defaultSelectedIndex = 0; - _titleView.cellSpacing = kGetScaleWidth(2); - _titleView.cellWidth = kGetScaleWidth(20); + _titleView.cellSpacing = kGetScaleWidth(20); + _titleView.listContainer = (id)self.pagingView.listContainerView; -// JXCategoryIndicatorImageView * indocator = [[JXCategoryIndicatorImageView alloc] init]; -// indocator.indicatorImageView.image = [UIImage imageNamed:@"home_slider_bg"]; -// indocator.indicatorImageViewSize = CGSizeMake(kGetScaleWidth(36), kGetScaleWidth(8)); -// indocator.verticalMargin = 4; -// indocator.contentMode = UIViewContentModeScaleAspectFit; -// _titleView.indicators = @[indocator]; + JXCategoryIndicatorImageView * indocator = [[JXCategoryIndicatorImageView alloc] init]; + indocator.indicatorImageView.image = [UIImage imageNamed:@"ms_hoem_index_icon"]; + indocator.indicatorImageViewSize = CGSizeMake(kGetScaleWidth(24), kGetScaleWidth(24)); + indocator.verticalMargin = -kGetScaleWidth(4); + indocator.contentMode = UIViewContentModeScaleAspectFit; + _titleView.indicators = @[indocator]; } return _titleView; } diff --git a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m b/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m index b0a7c02b..cc168dca 100644 --- a/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m +++ b/YuMi/Modules/YMRoom/View/ActivityContainerView/XPRoomActivityContainerView.m @@ -628,6 +628,11 @@ UIKIT_EXTERN NSString *kShowFirstRechargeView; _pi_cycleScrollView.bannerImageViewContentMode = UIViewContentModeScaleAspectFit; _pi_cycleScrollView.pageControlBottomOffset = -10; _pi_cycleScrollView.hidden = YES; + // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 + _pi_cycleScrollView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + for (UIView *subView in _pi_cycleScrollView.subviews) { + subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + } } return _pi_cycleScrollView; diff --git a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.m b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.m index fe92b5be..73321537 100644 --- a/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.m +++ b/YuMi/Modules/YMRoom/View/AnchorPK/View/XPAnchorPKSelectTypeController.m @@ -187,7 +187,7 @@ - (UIButton *)randomPKButton { if (!_randomPKButton) { _randomPKButton = [[UIButton alloc] init]; - [_randomPKButton setImage:[UIImage imageNamed:@"anchor_pk_random_icon"] forState:UIControlStateNormal]; + [_randomPKButton setImage:[UIImage getLanguageImage:@"anchor_pk_random_icon"] forState:UIControlStateNormal]; [_randomPKButton addTarget:self action:@selector(randomButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } return _randomPKButton; @@ -196,7 +196,7 @@ - (UIButton *)invitePKButton { if (!_invitePKButton) { _invitePKButton = [[UIButton alloc] init]; - [_invitePKButton setImage:[UIImage imageNamed:@"anchor_pk_invite_icon"] forState:UIControlStateNormal]; + [_invitePKButton setImage:[UIImage getLanguageImage:@"anchor_pk_invite_icon"] forState:UIControlStateNormal]; [_invitePKButton addTarget:self action:@selector(inviteButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } return _invitePKButton; diff --git a/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m b/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m index 955acfd6..4ba8310e 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/PIUniversalBannerView.m @@ -61,7 +61,8 @@ _model = model; NSDictionary *textDic = model.template; if(textDic.allKeys.count == 0)return ; - NSString *title = textDic[@"zh-CHT"] == nil ? textDic[textDic.allKeys.firstObject] : textDic[@"zh-CHT"]; + NSString *key = [NSBundle uploadLanguageText]; + NSString *title = textDic[key] == nil ? textDic[textDic.allKeys.firstObject] : textDic[key]; if(title.length == 0)return; [title stringByReplacingOccurrencesOfString:@"\n" withString:@""]; @@ -72,7 +73,7 @@ if([model.type isEqualToString:@"TEXT"]){ NSDictionary *subTextDic = model.text; if(subTextDic.allKeys.count > 0){ - NSString *subText = subTextDic[@"zh-CHT"] == nil ? subTextDic[subTextDic.allKeys.firstObject] : subTextDic[@"zh-CHT"]; + NSString *subText = subTextDic[key] == nil ? subTextDic[subTextDic.allKeys.firstObject] : subTextDic[key]; NSAttributedString *attText = [[NSAttributedString alloc]initWithString:subText attributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:model.textColor],NSFontAttributeName:[UIFont systemFontOfSize:font]}]; if ([attribute.string containsString:[NSString stringWithFormat:@"{%@}",model.key]]){ [attribute replaceCharactersInRange:[attribute.string rangeOfString:[NSString stringWithFormat:@"{%@}",model.key]] withAttributedString:attText]; diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnchorRankBannerView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnchorRankBannerView.m index 6c2fcbbd..f9a4954f 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnchorRankBannerView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomAnchorRankBannerView.m @@ -108,7 +108,7 @@ - (UIButton *)lookUpBtn{ if(!_lookUpBtn){ _lookUpBtn = [UIButton new]; - [_lookUpBtn setBackgroundImage:kImage(@"anchor_hour_rank_icon") forState:UIControlStateNormal]; + [_lookUpBtn setBackgroundImage:[UIImage getLanguageImage:@"anchor_hour_rank_icon"] forState:UIControlStateNormal]; [_lookUpBtn addTarget:self action:@selector(lookUpAction) forControlEvents:UIControlEventTouchUpInside]; } return _lookUpBtn; diff --git a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.m b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.m index d01c3fdd..31a9d2d2 100644 --- a/YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.m +++ b/YuMi/Modules/YMRoom/View/AnimationView/XPRoomYearActivityView.m @@ -205,7 +205,7 @@ - (UIButton *)gotoButton { if (!_gotoButton) { _gotoButton = [[UIButton alloc] init]; - [_gotoButton setBackgroundImage:[UIImage imageNamed:@"YearActivity_goto"] forState:UIControlStateNormal]; + [_gotoButton setBackgroundImage:[UIImage getLanguageImage:@"YearActivity_goto"] forState:UIControlStateNormal]; [_gotoButton addTarget:self action:@selector(onGotoButtonClick:) forControlEvents:UIControlEventTouchUpInside]; } return _gotoButton; diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m index ee841535..e8e3b31a 100644 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m +++ b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomFunctionContainerView.m @@ -258,10 +258,11 @@ } - (void)initSubViewConstraints { + CGFloat width = isMSRTL() ? 105 : 99; [self.contributeEnterView mas_makeConstraints:^(MASConstraintMaker *make) { make.trailing.mas_equalTo(12); make.top.mas_equalTo(kNavigationHeight+4); - make.width.mas_equalTo(99); + make.width.mas_equalTo(width); make.height.mas_equalTo(24); }]; @@ -272,31 +273,33 @@ }]; } - (void)showLittleGameMiniView:(RoomType)type micCount:(NSInteger)micCount { - if([ClientConfig shareConfig].canOpen){ - if (type == RoomType_MiniGame) { - if (!self.littleGameMiniView.superview) { - [self addSubview:self.littleGameMiniView]; - [self.littleGameMiniView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(0); - make.top.mas_equalTo(kNavigationHeight); - make.height.mas_equalTo(23); - }]; - } - self.littleGameMiniView.micCount = micCount; - if (micCount > 6) { - [self.littleGameMiniView removeFromSuperview]; - } - } else { - if (self.littleGameMiniView.superview) { - [self.littleGameMiniView removeFromSuperview]; - } - } - }else{ - if (self.littleGameMiniView.superview) { - [self.littleGameMiniView removeFromSuperview]; - } +// if([ClientConfig shareConfig].canOpen){ +// if (type == RoomType_MiniGame) { +// if (!self.littleGameMiniView.superview) { +// [self addSubview:self.littleGameMiniView]; +// [self.littleGameMiniView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.trailing.mas_equalTo(0); +// make.top.mas_equalTo(kNavigationHeight); +// make.height.mas_equalTo(23); +// }]; +// } +// self.littleGameMiniView.micCount = micCount; +// if (micCount > 6) { +// [self.littleGameMiniView removeFromSuperview]; +// } +// } else { +// if (self.littleGameMiniView.superview) { +// [self.littleGameMiniView removeFromSuperview]; +// } +// } +// }else{ +// if (self.littleGameMiniView.superview) { +// [self.littleGameMiniView removeFromSuperview]; +// } +// } + if (self.littleGameMiniView.superview) { + [self.littleGameMiniView removeFromSuperview]; } - } - (void)configLittleGameState { @@ -497,18 +500,20 @@ } } -(void)updateRankViewConstraintsWityType:(RoomType)type{ + CGFloat width = isMSRTL() ? 105 : 99; if(type == RoomType_MiniGame){ + [self.contributeEnterView mas_remakeConstraints:^(MASConstraintMaker *make) { make.leading.mas_equalTo(-12); make.top.mas_equalTo(kNavigationHeight+4); - make.width.mas_equalTo(99); + make.width.mas_equalTo(width); make.height.mas_equalTo(24); }]; }else{ [self.contributeEnterView mas_remakeConstraints:^(MASConstraintMaker *make) { make.trailing.mas_equalTo(12); make.top.mas_equalTo(kNavigationHeight+4); - make.width.mas_equalTo(99); + make.width.mas_equalTo(width); make.height.mas_equalTo(24); }]; } diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m index 7ad6abe3..ca1904a7 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeBuySuccessView.m @@ -147,7 +147,7 @@ -(UIImageView *)titleView{ if(!_titleView){ _titleView = [UIImageView new]; - _titleView.image = kImage(@"room_candy_tree_buy_love_title"); + _titleView.image = [UIImage getLanguageImage:@"room_candy_tree_buy_love_title"]; } return _titleView; } diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m index 9cf4868a..ef41f8a5 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeConfirmBuyView.m @@ -296,7 +296,7 @@ -(UIImageView *)titleView{ if(!_titleView){ _titleView = [UIImageView new]; - _titleView.image = kImage(@"room_candy_tree_confirm_buy_title"); + _titleView.image = [UIImage getLanguageImage:@"room_candy_tree_confirm_buy_title"]; } return _titleView; } diff --git a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m index b38696c4..62cc7833 100644 --- a/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m +++ b/YuMi/Modules/YMRoom/View/CandyTree/View/XPCandyTreeViewController.m @@ -666,7 +666,7 @@ UIKIT_EXTERN NSString * const kRoomReceivedCandyNotificationKey; if(!_fristLoveBtn){ _fristLoveBtn = [UIButton new]; _fristLoveBtn.yn_acceptEventInterval = 1; - [_fristLoveBtn setBackgroundImage:kImage(@"room_candy_tree_frist_tap_bg") forState:UIControlStateNormal]; + [_fristLoveBtn setBackgroundImage:[UIImage getLanguageImage:@"room_candy_tree_frist_tap_bg"] forState:UIControlStateNormal]; [_fristLoveBtn addTarget:self action:@selector(fineLoveAction:) forControlEvents:UIControlEventTouchUpInside]; } return _fristLoveBtn; @@ -675,7 +675,7 @@ UIKIT_EXTERN NSString * const kRoomReceivedCandyNotificationKey; if(!_tenthLoveBtn){ _tenthLoveBtn = [UIButton new]; _tenthLoveBtn.yn_acceptEventInterval = 1; - [_tenthLoveBtn setBackgroundImage:kImage(@"room_candy_tree_ten_tap_bg") forState:UIControlStateNormal]; + [_tenthLoveBtn setBackgroundImage:[UIImage getLanguageImage:@"room_candy_tree_ten_tap_bg"] forState:UIControlStateNormal]; [_tenthLoveBtn addTarget:self action:@selector(fineLoveAction:) forControlEvents:UIControlEventTouchUpInside]; } return _tenthLoveBtn; @@ -684,7 +684,7 @@ UIKIT_EXTERN NSString * const kRoomReceivedCandyNotificationKey; if(!_hundredthLoveBtn){ _hundredthLoveBtn = [UIButton new]; _hundredthLoveBtn.yn_acceptEventInterval = 1; - [_hundredthLoveBtn setBackgroundImage:kImage(@"room_candy_tree_hundredth_tap_bg") forState:UIControlStateNormal]; + [_hundredthLoveBtn setBackgroundImage:[UIImage getLanguageImage:@"room_candy_tree_hundredth_tap_bg"] forState:UIControlStateNormal]; [_hundredthLoveBtn addTarget:self action:@selector(fineLoveAction:) forControlEvents:UIControlEventTouchUpInside]; } return _hundredthLoveBtn; @@ -693,7 +693,7 @@ UIKIT_EXTERN NSString * const kRoomReceivedCandyNotificationKey; if(!_twoHundredhLoveBtn){ _twoHundredhLoveBtn = [UIButton new]; _twoHundredhLoveBtn.yn_acceptEventInterval = 1; - [_twoHundredhLoveBtn setBackgroundImage:kImage(@"room_candy_two_hundredth_tap_bg") forState:UIControlStateNormal]; + [_twoHundredhLoveBtn setBackgroundImage:[UIImage getLanguageImage:@"room_candy_two_hundredth_tap_bg"] forState:UIControlStateNormal]; [_twoHundredhLoveBtn addTarget:self action:@selector(fineLoveAction:) forControlEvents:UIControlEventTouchUpInside]; } return _twoHundredhLoveBtn; diff --git a/YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.m b/YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.m index 6092b4f2..d09e0198 100644 --- a/YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.m +++ b/YuMi/Modules/YMRoom/View/FreeGiftsView/View/SubViews/XPFreeGiftsObtainView.m @@ -56,7 +56,7 @@ [self.titleView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(41)); make.height.mas_equalTo(kGetScaleWidth(21)); - make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(0)); + make.leading.trailing.equalTo(self.bgView).inset(kGetScaleWidth(5)); }]; [self.iconView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kGetScaleWidth(78)); @@ -112,6 +112,7 @@ if (!_titleView){ _titleView = [UILabel labelInitWithText:@"" font:kFontMedium(15) textColor:[UIColor whiteColor]]; _titleView.textAlignment = NSTextAlignmentCenter; + _titleView.numberOfLines = 2; } return _titleView; } diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.m b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.m index 99d05594..b0352647 100644 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.m +++ b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomOpenView.m @@ -294,6 +294,7 @@ [_gameRoomButton setImage:[UIImage getLanguageImage:@"room_little_game_game_room_select"] forState:UIControlStateSelected]; [_gameRoomButton addTarget:self action:@selector(gameRoomButtonAction:) forControlEvents:UIControlEventTouchUpInside]; _gameRoomButton.selected = NO; + _gameRoomButton.hidden = YES; } return _gameRoomButton; } diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.m index adc3d3d4..17d7fbb3 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/Model/XPMessageInfoModel.m @@ -27,12 +27,13 @@ - (void)setContent:(NSAttributedString *)content { _content = content; + CGFloat width = isMSRTL() ? 10 : 0; CGSize maxSize = CGSizeMake(kRoomMessageMaxWidth - self.contentLeftMargin - self.contentRightMargin - 12, MAXFLOAT); YYTextContainer *container = [YYTextContainer containerWithSize:maxSize]; container.maximumNumberOfRows = 0; YYTextLayout *layout = [YYTextLayout layoutWithContainer:container text:self.content]; CGFloat rowHeight = layout.textBoundingSize.height + self.contentTopMargin + self.contentBottomMargin + self.cellBottomMargin; - self.rowHeight = rowHeight; + self.rowHeight = rowHeight + width; } @end diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m index c753b14a..434a54d2 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/Tool/XPRoomMessageParser.m @@ -471,7 +471,8 @@ PIGeneralPublicScreenModel *screenModel = [PIGeneralPublicScreenModel modelWithDictionary:attachment.data]; NSDictionary *textDic = screenModel.template; if(textDic.allKeys.count == 0)return messageInfo; - NSString *title = textDic[@"zh-CHT"] == nil ? textDic[textDic.allKeys.firstObject] : textDic[@"zh-CHT"]; + NSString *key = [NSBundle uploadLanguageText]; + NSString *title = textDic[key] == nil ? textDic[textDic.allKeys.firstObject] : textDic[key]; if(title.length == 0)return messageInfo; NSMutableAttributedString * attribute = [[NSMutableAttributedString alloc] initWithString:title attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:kRoomMessageDefalutFont],NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:screenModel.textColor]}]; @@ -479,7 +480,7 @@ if([model.type isEqualToString:@"TEXT"]){ NSDictionary *subTextDic = model.text; if(subTextDic.allKeys.count > 0){ - NSString *subText = subTextDic[@"zh-CHT"] == nil ? subTextDic[subTextDic.allKeys.firstObject] : subTextDic[@"zh-CHT"]; + NSString *subText = subTextDic[key] == nil ? subTextDic[subTextDic.allKeys.firstObject] : subTextDic[key]; NSAttributedString *attText = [[NSAttributedString alloc]initWithString:subText attributes:@{NSForegroundColorAttributeName:[DJDKMIMOMColor colorWithHexString:model.textColor]}]; if ([attribute.string containsString:[NSString stringWithFormat:@"{%@}",model.key]]){ [attribute replaceCharactersInRange:[attribute.string rangeOfString:[NSString stringWithFormat:@"{%@}",model.key]] withAttributedString:attText]; @@ -1126,7 +1127,7 @@ [attribute appendAttributedString:[self createSapceAttribute:2]]; //x N - [attribute appendAttributedString:[self createTextAttribute: [NSString stringWithFormat:@" X%ld",giftListInfo.giftNum] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; + [attribute appendAttributedString:[self createTextAttribute:[NSString stringWithFormat:@" X%ld",giftListInfo.giftNum] color:[DJDKMIMOMColor messageTextColor] font:kRoomMessageDefalutFont]]; if (info.luckyGiftList.giftList.count-1 != idx) { //, [attribute appendAttributedString:[self createTextAttribute:@"," color:[DJDKMIMOMColor messageDefaultTextColor] font:kRoomMessageDefalutFont]]; @@ -1221,7 +1222,7 @@ [attribute appendAttributedString:[self createLanguageImageAttribute:@"room_new_user_greet_new"]]; [attribute appendAttributedString:[self createSapceAttribute:2]]; } else { - [attribute appendAttributedString: [self createLocalImageAttribute:@"common_new_user"]]; + [attribute appendAttributedString: [self createLocalImageAttribute:[UIImage getLanguageText:@"common_new_user"]]]; [attribute appendAttributedString:[self createSapceAttribute:2]]; } } diff --git a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m index 05744fca..234bfcbf 100644 --- a/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/MessageContainerView/View/XPRoomMessageTableViewCell.m @@ -50,6 +50,7 @@ } - (void)initSubViewConstraints { + CGFloat width = kRoomMessageMaxWidth - 24-10; [self.bubbleImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.top.mas_equalTo(self.contentView); make.bottom.mas_equalTo(self.contentView).offset(-6); @@ -60,6 +61,7 @@ make.leading.mas_equalTo(self.bubbleImageView).offset(12); make.bottom.mas_equalTo(self.bubbleImageView).offset(-10); make.top.mas_equalTo(self.bubbleImageView).mas_offset(10); + make.width.mas_lessThanOrEqualTo(width); }]; } diff --git a/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m b/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m index 932f27ce..c0381f5a 100644 --- a/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m +++ b/YuMi/Modules/YMRoom/View/RoomHeaderView/RoomHeaderView.m @@ -55,8 +55,6 @@ @property (nonatomic,strong) YYLabel *idLabel; ///收藏 @property (nonatomic,strong) UIButton *collectButton; -///取消收藏 -@property (nonatomic,strong) UIButton *cancelButton; ///分享 @property (nonatomic,strong) UIButton *shareButton; ///设置 @@ -126,7 +124,7 @@ [self addSubview:self.nickStackView]; [self addSubview:self.collectButton]; - [self addSubview:self.cancelButton]; + [self addSubview:self.shareButton]; [self addSubview:self.settingButton]; [self addSubview:self.backBtn]; @@ -154,15 +152,13 @@ make.centerY.mas_equalTo(self.settingButton); make.width.height.mas_equalTo(22); }]; - + [self.collectButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.settingButton); - make.leading.equalTo(self.nickStackView.mas_trailing).offset(6); - make.size.mas_equalTo(CGSizeMake(52, 23)); - }]; - [self.cancelButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.equalTo(self.collectButton); + make.leading.equalTo(self.titleLabel.mas_trailing).offset(15); + make.size.mas_equalTo(CGSizeMake(20, 20)); }]; + [self.nickStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.settingButton); make.leading.mas_equalTo(self).offset(35); @@ -211,10 +207,10 @@ self.giftEffectImageView.hidden = roomInfo.hasAnimationEffect; if (roomInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { self.collectButton.hidden = YES; - self.cancelButton.hidden = YES; } else { - self.collectButton.hidden = roomInfo.isRoomFans; - self.cancelButton.hidden = !roomInfo.isRoomFans; + self.collectButton.hidden = NO; + self.collectButton.selected = roomInfo.isRoomFans; + } self.lockRoomImageView.hidden = roomInfo.roomPwd.length <= 0; } @@ -227,10 +223,11 @@ self.giftEffectImageView.hidden = roomInfo.hasAnimationEffect; if (roomInfo.uid == [AccountInfoStorage instance].getUid.integerValue) { self.collectButton.hidden = YES; - self.cancelButton.hidden = YES; + } else { - self.collectButton.hidden = roomInfo.isRoomFans; - self.cancelButton.hidden = !roomInfo.isRoomFans; + self.collectButton.hidden = NO; + self.collectButton.selected = roomInfo.isRoomFans; + } self.lockRoomImageView.hidden = roomInfo.roomPwd.length <= 0; } @@ -286,14 +283,14 @@ - NSString * type = sender == self.cancelButton ? @"2" : @"1"; + NSString * type = self.collectButton.selected ? @"2" : @"1"; NSString * uid = [AccountInfoStorage instance].getUid; NSString * roomUid = [NSString stringWithFormat:@"%ld", self.hostDelegate.getRoomInfo.uid]; [Api collectRoom:^(BaseModel * _Nullable data, NSInteger code, NSString * _Nullable msg) { if (code == 200) { - self.collectButton.hidden = !self.collectButton.hidden; - self.cancelButton.hidden = !self.cancelButton.hidden; + self.collectButton.selected = !self.collectButton.selected; + if ([type isEqualToString:@"1"]) {///收藏的话 @@ -408,6 +405,7 @@ [_shareButton setImage:[UIImage imageNamed:@"room_info_share"] forState:UIControlStateNormal]; [_shareButton addTarget:self action:@selector(shareButtonAction:) forControlEvents:UIControlEventTouchUpInside]; [_shareButton setEnlargeEdgeWithTop:8 right:8 bottom:8 left:8]; + _shareButton.hidden = YES; } return _shareButton; } @@ -425,33 +423,15 @@ - (UIButton *)collectButton { if (!_collectButton) { _collectButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_collectButton setTitle:YMLocalizedString(@"RoomHeaderView8") forState:UIControlStateNormal]; - [_collectButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _collectButton.titleLabel.font = [UIFont systemFontOfSize:12]; - - _collectButton.backgroundColor = UIColorFromRGB(0x67D7D7); - _collectButton.layer.masksToBounds = YES; - _collectButton.layer.cornerRadius = 23 / 2.0; + [_collectButton setImage:kImage(@"ms_room_top_no_collect") forState:UIControlStateNormal]; + [_collectButton setImage:kImage(@"ms_room_top_collect") forState:UIControlStateSelected]; _collectButton.hidden = YES; + [_collectButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; [_collectButton addTarget:self action:@selector(collectButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } return _collectButton; } --(UIButton *)cancelButton{ - if (!_cancelButton){ - _cancelButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_cancelButton setTitle:YMLocalizedString(@"RoomHeaderView9") forState:UIControlStateNormal]; - [_cancelButton setTitleColor:[UIColor colorWithWhite:1 alpha:0.9] forState:UIControlStateNormal]; - _cancelButton.titleLabel.font = [UIFont systemFontOfSize:12]; - [_cancelButton setBackgroundImage:[UIImage new] forState:UIControlStateNormal]; - _cancelButton.backgroundColor = [UIColor colorWithWhite:1 alpha:0.3]; - _cancelButton.layer.masksToBounds = YES; - _cancelButton.layer.cornerRadius = 23 / 2.0; - _cancelButton.hidden = YES; - [_cancelButton addTarget:self action:@selector(collectButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - } - return _cancelButton; -} + - (UIStackView *)nickStackView { if (!_nickStackView) { _nickStackView = [[UIStackView alloc] init]; diff --git a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m index 7bc39d30..110d1785 100644 --- a/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m +++ b/YuMi/Modules/YMRoom/View/RoomPK/View/XPRoomPKResultView.m @@ -302,13 +302,13 @@ if (self.roomPKResultInfoModel.result == RoomPKResultType_Draw) { // win // 看到的是 平局 self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"]; - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_draw_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_draw_bg"]; } else if(self.roomPKResultInfoModel.result == RoomPKResultType_Blue) { // loser // 看到的是 蓝队 win - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_win_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_win_bg"]; self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_win_bg"]; } else { - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_loser_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_loser_bg"]; self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"]; } @@ -344,14 +344,14 @@ } if (self.roomPKResultInfoModel.result == RoomPKResultType_Red) { // win - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_win_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_win_bg"]; self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_win_bg"]; } else if (self.roomPKResultInfoModel.result == RoomPKResultType_Blue) { // loser - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_loser_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_loser_bg"]; self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"]; self.failDesLabel.hidden = NO; } else { // 平局 - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_draw_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_draw_bg"]; self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"]; } [self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView3") forState:UIControlStateNormal]; @@ -390,13 +390,13 @@ if (self.roomPKResultInfoModel.result == RoomPKResultType_Draw) { // win // 看到的是 平局 self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"]; - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_draw_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_draw_bg"]; } else if(self.roomPKResultInfoModel.result == RoomPKResultType_Blue) { // loser // 看到的是 蓝队 win - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_loser_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_loser_bg"]; self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"]; } else { - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_win_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_win_bg"]; self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_win_bg"]; } @@ -431,15 +431,15 @@ } if (self.roomPKResultInfoModel.result == RoomPKResultType_Blue) { // win - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_win_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_win_bg"]; self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_win_bg"]; } else if (self.roomPKResultInfoModel.result == RoomPKResultType_Red) { // loser self.failDesLabel.hidden = NO; - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_loser_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_loser_bg"]; self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"]; } else { // 平局 self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"]; - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_draw_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_draw_bg"]; } [self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView9") forState:UIControlStateNormal]; [self.resultButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal]; @@ -475,7 +475,7 @@ - (void)handleMyInAudiencePKTeam:(RoomPKTeamModel *)redPKTeam bluePKTeam:(RoomPKTeamModel *)bluePKTeam { // 观众弹的是胜利方, 点击查看其它的则是查看失败方, 平局没有查看对方的情况 if (self.isChecOther) { // 查看失败方战绩 - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_loser_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_loser_bg"]; self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"]; if (self.roomPKResultInfoModel.result == RoomPKResultType_Blue) { [self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView6") forState:UIControlStateNormal]; @@ -528,7 +528,7 @@ // 弹胜利方的框 if (self.roomPKResultInfoModel.result == RoomPKResultType_Blue) { // win - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_win_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_win_bg"]; self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_win_bg"]; [self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView18") forState:UIControlStateNormal]; [self.resultButton setTitleColor:kBlueTeamColor forState:UIControlStateNormal]; @@ -547,7 +547,7 @@ self.guardScoreLable.content = [NSString stringWithFormat:@"%lld", bluePKTeam.protecScore]; [self loadTeamMemberUserAvatar:bluePKTeam.teamMembers mvpUserId:bluePKTeam.mvp]; } else if (self.roomPKResultInfoModel.result == RoomPKResultType_Red) { // loser - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_win_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_win_bg"]; self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_win_bg"]; [self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView21") forState:UIControlStateNormal]; [self.resultButton setTitleColor:kRedTeamColor forState:UIControlStateNormal]; @@ -567,7 +567,7 @@ [self loadTeamMemberUserAvatar:redPKTeam.teamMembers mvpUserId:redPKTeam.mvp]; } else { // 平局 self.bottomImageView.image = [UIImage imageNamed:@"room_pk_result_bottom_loser_bg"]; - self.topImageView.image = [UIImage imageNamed:@"room_pk_result_top_draw_bg"]; + self.topImageView.image = [UIImage getLanguageImage:@"room_pk_result_top_draw_bg"]; [self.resultButton setTitle:YMLocalizedString(@"XPRoomPKResultView24") forState:UIControlStateNormal]; [self.resultButton setTitleColor:kRedTeamColor forState:UIControlStateNormal]; self.checkButton.hidden = YES; diff --git a/YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.m b/YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.m index 8bf412dd..a9fc71ad 100644 --- a/YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.m +++ b/YuMi/Modules/YMRoom/View/RoomRecommend/XPRoomRecommendView.m @@ -77,7 +77,7 @@ }]; [self.exitStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.mas_equalTo(kStatusBarHeight + 8); - make.leading.mas_equalTo(self.miniStackView.mas_trailing).mas_offset(72); + make.leading.mas_equalTo(self.miniStackView.mas_trailing).mas_offset(65); }]; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m index 70aaff30..61bd646c 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/Cell/XPGiftItemCollectionViewCell.m @@ -234,7 +234,7 @@ } - (UIImageView *)giftNewImageView { if (!_giftNewImageView) { - _giftNewImageView = [self createImageView:@"gift_tag_latest"]; + _giftNewImageView = [self createImageView:[UIImage getLanguageText:@"gift_tag_latest"]]; } return _giftNewImageView; } @@ -329,7 +329,7 @@ - (UIImageView *)superGiftView{ if(!_superGiftView){ _superGiftView = [UIImageView new]; - _superGiftView.image = kImage(@"room_gift_super_gift_icon"); + _superGiftView.image = [UIImage getLanguageImage:@"room_gift_super_gift_icon"]; _superGiftView.hidden = YES; } return _superGiftView; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m index 2adbc8c6..fe3a5c9d 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/PIGiftInfoSegmentedView.m @@ -81,7 +81,7 @@ [self.packGiftButton mas_makeConstraints:^(MASConstraintMaker *make) { make.trailing.mas_equalTo(-15); make.centerY.height.mas_equalTo(self.titleView); - make.width.mas_equalTo(35); + make.width.mas_equalTo(40); }]; [self.totalValueLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.trailing.mas_equalTo(self.packGiftButton.mas_leading).mas_offset(-3); diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m index d9223f5a..794d94ae 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m @@ -204,6 +204,11 @@ static NSString *kHideGiftViewInteractDot = @"kHideGiftViewInteractDot";//是否 _pi_BannerView.bannerImageViewContentMode = UIViewContentModeScaleAspectFit; _pi_BannerView.pageControlBottomOffset = -10; _pi_BannerView.autoScrollTimeInterval = 5; + // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 + _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + for (UIView *subView in _pi_BannerView.subviews) { + subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + } } return _pi_BannerView; } diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m index 70bd3f06..705f2a63 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftLuckyGiftBroadcastView.m @@ -195,6 +195,11 @@ _pi_BannerView.showPageControl = NO; _pi_BannerView.autoScrollTimeInterval = 3.0; [_pi_BannerView disableScrollGesture]; + // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 + _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + for (UIView *subView in _pi_BannerView.subviews) { + subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + } } return _pi_BannerView; } diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m index 9ccca8ab..7898c277 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftTwelveStarBroadcastView.m @@ -111,6 +111,11 @@ _pi_BannerView.showPageControl = NO; _pi_BannerView.autoScrollTimeInterval = 5; [_pi_BannerView disableScrollGesture]; + // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 + _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + for (UIView *subView in _pi_BannerView.subviews) { + subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + } } return _pi_BannerView; } @@ -152,7 +157,7 @@ } -(void)setUserModel:(XPWeekStarRankUserModel *)userModel{ _userModel = userModel; - _bgImageView.image = _userModel.type == 0 ? kImage(@"gift_twelve_star_Banner_naming_bg"):kImage(@"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){ diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/PITreasureFairyBuyElfShardSuccessView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/PITreasureFairyBuyElfShardSuccessView.m index 367ec943..810d15cf 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/PITreasureFairyBuyElfShardSuccessView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/PITreasureFairyBuyElfShardSuccessView.m @@ -142,7 +142,7 @@ -(UIImageView *)titleView{ if(!_titleView){ _titleView = [UIImageView new]; - _titleView.image = kImage(@"room_treasure_fairy_buy_elf_title"); + _titleView.image = [UIImage getLanguageImage:@"room_treasure_fairy_buy_elf_title"]; } return _titleView; } diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsContentView.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsContentView.m index 35315b54..22d61678 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsContentView.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/View/XPTreasureFairyTrialsContentView.m @@ -543,8 +543,8 @@ [self.trialsButton setImage:[UIImage getLanguageImage:@"room_treasure_fairy_trials_sure_bg"] forState:UIControlStateNormal]; [self.trialsButton setImage:[UIImage getLanguageImage:@"room_treasure_fairy_trials_sure_bg"] forState:UIControlStateSelected]; } else { - [self.trialsButton setImage:[UIImage imageNamed:@"room_treasure_fairy_trials_salvage_bg"] forState:UIControlStateNormal]; - [self.trialsButton setImage:[UIImage imageNamed:@"room_treasure_fairy_trials_salvage_bg"] forState:UIControlStateSelected]; + [self.trialsButton setImage:[UIImage getLanguageImage:@"room_treasure_fairy_trials_salvage_bg"] forState:UIControlStateNormal]; + [self.trialsButton setImage:[UIImage getLanguageImage:@"room_treasure_fairy_trials_salvage_bg"] forState:UIControlStateSelected]; self.viewList = @[self.firstView, self.secondView, self.thirdView,self.fourthView,self.fifthView,self.sixthView]; self.ballViewList = @[self.threeBallView]; self.backImageView.image = [UIImage imageNamed:@"room_treasure_fairy_trials_middle_bg"]; diff --git a/YuMi/Modules/YMRoom/View/TreasureFairy/View/XPTreasureFairyViewController.m b/YuMi/Modules/YMRoom/View/TreasureFairy/View/XPTreasureFairyViewController.m index 585ef590..c4eb5720 100644 --- a/YuMi/Modules/YMRoom/View/TreasureFairy/View/XPTreasureFairyViewController.m +++ b/YuMi/Modules/YMRoom/View/TreasureFairy/View/XPTreasureFairyViewController.m @@ -743,7 +743,7 @@ if (!_ticketImageView) { _ticketImageView = [[UIImageView alloc] init]; _ticketImageView.userInteractionEnabled = YES; - _ticketImageView.image = [UIImage imageNamed:@"room_treasure_fairy_ticket"]; + _ticketImageView.image = [UIImage getLanguageImage:@"room_treasure_fairy_ticket"]; } return _ticketImageView; } @@ -828,8 +828,8 @@ if (!_oneButton) { _oneButton = [UIButton buttonWithType:UIButtonTypeCustom]; _oneButton.yn_acceptEventInterval = 1; - [_oneButton setImage:[UIImage imageNamed:@"room_treasure_fairy_one_bg"] forState:UIControlStateNormal]; - [_oneButton setImage:[UIImage imageNamed:@"room_treasure_fairy_one_bg"] forState:UIControlStateSelected]; + [_oneButton setImage:[UIImage getLanguageImage:@"room_treasure_fairy_one_bg"] forState:UIControlStateNormal]; + [_oneButton setImage:[UIImage getLanguageImage:@"room_treasure_fairy_one_bg"] forState:UIControlStateSelected]; [_oneButton addTarget:self action:@selector(oneButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } @@ -840,8 +840,8 @@ if (!_tenButton) { _tenButton = [UIButton buttonWithType:UIButtonTypeCustom]; _tenButton.yn_acceptEventInterval = 1; - [_tenButton setImage:[UIImage imageNamed:@"room_treasure_fairy_ten_bg"] forState:UIControlStateNormal]; - [_tenButton setImage:[UIImage imageNamed:@"room_treasure_fairy_ten_bg"] forState:UIControlStateSelected]; + [_tenButton setImage:[UIImage getLanguageImage:@"room_treasure_fairy_ten_bg"] forState:UIControlStateNormal]; + [_tenButton setImage:[UIImage getLanguageImage:@"room_treasure_fairy_ten_bg"] forState:UIControlStateSelected]; [_tenButton addTarget:self action:@selector(tenButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } @@ -852,8 +852,8 @@ if (!_hundredButton) { _hundredButton = [UIButton buttonWithType:UIButtonTypeCustom]; _hundredButton.yn_acceptEventInterval = 1; - [_hundredButton setImage:[UIImage imageNamed:@"room_treasure_fairy_hundred_bg"] forState:UIControlStateNormal]; - [_hundredButton setImage:[UIImage imageNamed:@"room_treasure_fairy_hundred_bg"] forState:UIControlStateSelected]; + [_hundredButton setImage:[UIImage getLanguageImage:@"room_treasure_fairy_hundred_bg"] forState:UIControlStateNormal]; + [_hundredButton setImage:[UIImage getLanguageImage:@"room_treasure_fairy_hundred_bg"] forState:UIControlStateSelected]; [_hundredButton addTarget:self action:@selector(hundredButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } diff --git a/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m b/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m index 23dbf553..5750d0c9 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m +++ b/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m @@ -399,6 +399,8 @@ } [[self getView] onGetMicroFunctionArraySuccess:array]; }]; + }else { + [[self getView] onGetMicroFunctionArraySuccess:@[]]; } }]; } @@ -645,7 +647,7 @@ - (XPUserCardItemModel *)atItem { if (!_atItem) { _atItem = [[XPUserCardItemModel alloc] init]; - _atItem.title = @"@TA"; + _atItem.title = YMLocalizedString(@"XPUserCardPresenter22"); _atItem.imageName = @"usercard_chat_normal"; _atItem.selectImageName = @"usercard_chat_normal"; _atItem.type = UserCardItemType_AtUser; diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m index 4d09d45b..1867586e 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m +++ b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m @@ -535,7 +535,7 @@ if (userInfo.fromSayHelloChannel) { self.newUserImageView.image = [UIImage imageNamed:@"room_new_user_greet_new"]; } else { - self.newUserImageView.image = [UIImage imageNamed:@"common_new_user"]; + self.newUserImageView.image = [UIImage getLanguageImage:@"common_new_user"]; } } if (userInfo.userLevelVo.experUrl) { @@ -601,7 +601,14 @@ } - (void)onGetMicroFunctionArraySuccess:(NSArray *)array { - if (array.count <= 0) {return;} + if (array.count <= 0) { + if (self.datasource.count > 0){ + self.collectionView.hidden = NO; + [self.collectionView reloadData]; + [self updateCollectionHeight:self.datasource]; + } + + return;} // self.operaStackView.hidden = NO; // self.sepLineView.hidden = NO; @@ -1351,7 +1358,7 @@ if (!_newUserImageView) { _newUserImageView = [[UIImageView alloc] init]; _newUserImageView.userInteractionEnabled = YES; - _newUserImageView.image = [UIImage imageNamed:@"common_new_user"]; + _newUserImageView.image = [UIImage getLanguageImage:@"common_new_user"]; _newUserImageView.hidden = YES; } return _newUserImageView; diff --git a/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftEnterView.m b/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftEnterView.m index ad94c30d..c8b5c00b 100644 --- a/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftEnterView.m +++ b/YuMi/Modules/YMRoom/View/WishGift/View/View/XPWishGiftEnterView.m @@ -233,6 +233,11 @@ _pi_BannerView.delegate = self; _pi_BannerView.showPageControl = NO; _pi_BannerView.autoScrollTimeInterval = 10.0; + // SDCycleScrollView没有适配阿语，在RTL下会乱滚，都用LTR算了 + _pi_BannerView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + for (UIView *subView in _pi_BannerView.subviews) { + subView.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight; + } } return _pi_BannerView; } diff --git a/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m b/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m index 573c4586..422203f7 100644 --- a/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m +++ b/YuMi/Modules/YMTabbar/View/VersionUpdate/XPUpgradeView.m @@ -164,7 +164,7 @@ _topImageView = [UIImageView new]; _topImageView.backgroundColor = [UIColor clearColor]; _topImageView.userInteractionEnabled = YES; - _topImageView.image = [UIImage imageNamed:@"version_update_top_bg"]; + _topImageView.image = [UIImage getLanguageImage:@"version_update_top_bg"]; } return _topImageView; } diff --git a/YuMi/Network/HttpRequestHelper.m b/YuMi/Network/HttpRequestHelper.m index a7d2b4c2..1866a6f2 100644 --- a/YuMi/Network/HttpRequestHelper.m +++ b/YuMi/Network/HttpRequestHelper.m @@ -232,6 +232,8 @@ }else { [client.requestSerializer setValue:nil forHTTPHeaderField:@"pub_ticket"]; } + + [client.requestSerializer setValue:[NSBundle uploadLanguageText] forHTTPHeaderField:@"Accept-Language"]; } + (NSDictionary*)configBaseParmars:(NSDictionary *)parmars diff --git a/YuMi/Resources/home_heat.gif b/YuMi/Resources/home_heat.gif deleted file mode 100644 index dfb928b2..00000000 Binary files a/YuMi/Resources/home_heat.gif and /dev/null differ diff --git a/YuMi/ar.lproj/Localizable.strings b/YuMi/ar.lproj/Localizable.strings index 39b889d1..e0cdbb4b 100644 --- a/YuMi/ar.lproj/Localizable.strings +++ b/YuMi/ar.lproj/Localizable.strings @@ -1,4 +1,42 @@ +///XPCandyTreeRankView.m +"XPCandyTreeRankView0" = "ليس هناك المزيد من البيانات"; + +///XPCandyTreeMoreView.m +"XPCandyTreeMoreView0" = "المزيد"; +"XPCandyTreeMoreView2" = "سجل الجوائز"; +"XPCandyTreeMoreView3" = "قواعد اللعبة"; +"XPCandyTreeMoreView4" = "السماح بعرض رسائل الفوز للعموم"; +///XPCandyRankContainerView.m +"XPCandyRankContainerView0" = "ترتيب اليوم"; +"XPCandyRankContainerView1" = "ترتيب الأمس"; +///XPCandyTreeInsufficientBalanceView +"XPCandyTreeInsufficientBalanceView0"="تنبيه"; +"XPCandyTreeInsufficientBalanceView1"="رصيد العملة الذهبية غير كافٍ، يرجى القيام بعملية شحن أولاً~"; +"XPCandyTreeInsufficientBalanceView2"="الانتقال للشحن"; +///XPRoomActivityContainerView.m +"XPRoomActivityContainerView0" = "هدية الشحن الأولى"; +"XPRoomActivityContainerView1" = "الرموز"; +"XPRoomActivityContainerView2" = "لقد بدأت مسابقة PK ولا يمكن ترتيب الاستماع المؤقت"; +"XPRoomActivityContainerView3" = "هذا الحزمة الحمراء لم تعد صالحة"; +///XPWebViewNavView +"XPWebViewNavView0"="شحن"; +"XPWebViewNavView1" = "نسخ الرابط"; +///LoginPresenter.m +"LoginPresenter0" = "تم إلغاء تسجيل الدخول"; +"LoginPresenter1" = "فشل تسجيل الدخول، يرجى المحاولة مرة أخرى"; +///XPCandyTreeEmptyableViewCell.m +"XPCandyTreeEmptyableViewCell0" = "لا توجد بيانات متاحة"; + +///XPCandyTreeMoreRuleCell.m +"XPCandyTreeMoreRuleCell0" = "يمكن استخدام الثروة عندما تصل إلى مستوى %ld، هيا ارتقِ بسرعة~"; + + +"XPCandyTreeViewController2" = "عدد شراء القلوب لا يمكن أن يكون صفر!"; +"XPCandyTreeViewController4" = "الانضمام"; +"XPCandyTreeViewController5" = "يمكنك فقط تحديد 99999 مرة في المرة الواحدة"; +"XPCandyTreeViewController7" = "قائمة الأفضل"; + "LoginVerifCodeViewController0" = "احصل على رمز التحقق مرة أخرى لاحقًا"; "LoginVerifCodeViewController1" = "تم تسجيل الدخول بنجاح"; "LoginVerifCodeViewController2" = "تم إرسال رمز التحقق إلى"; @@ -19,7 +57,7 @@ "XPIncomeRecordGoldDetailsPickViewView4"=""; "XPIncomeRecordGoldDetailsPickViewView5"=""; "XPIncomeRecordGoldDetailsView0"="لا توجد بيانات مؤقتاً"; -"XPIncomeRecordGoldDetailsView1"="إجمالي تدفق العملات الذهبية في الغرفة الحالية: %@ قطعة"; +"XPIncomeRecordGoldDetailsView1"="إجمالي تدفق العملات في الغرفة الحالية: %@ عملة"; "XPIncomeRecordGoldDetailsVC0"="تفاصيل العملات الذهبية"; "XPIncomeRecordGoldDetailsVC1"="إلى"; @@ -147,7 +185,7 @@ "XPMineGuildIncomeStatisViewController0" = "إحصائيات الدخل"; "XPMineGuildIncomeStatisViewController1" = "إحصائيات يومية"; "XPMineGuildIncomeStatisViewController2" = "إحصائيات أسبوعية"; -"XPMineGuildIncomeStatisViewController3" = "تفاصيل العملة الذهبية"; + ///XPMineGuildIncomeDetailViewController.m "XPMineGuildIncomeDetailViewController0" = "تفاصيل الدخل"; @@ -266,7 +304,7 @@ "XPIncomeRecordCoinsDetailsPickViewView4"="الشهر"; "XPIncomeRecordCoinsDetailsPickViewView5"="اليوم"; -"XPNobleSettingViewController0" = "إعداد النبلاء"; +"XPNobleSettingViewController0" = "إعداد VIP"; "XPNobleSettingViewController1" = "الدخول إلى الغرفة بشكل مجهول"; "XPWishGiftInfoView0" = "%ld عملة ذهبية"; "XPMineGuildPersonalBillRecordHeadView3"="الإيرادات (نقود)"; @@ -363,10 +401,7 @@ "XPSessionListHeadFriendCell0" = "حيّ"; -"XPSessionListHeadView0" = "الإعلانات الرسمية"; -"XPSessionListHeadView1" = "تنبيهات الفعاليات"; -"XPSessionListHeadView2" = "تذكيرات الاشتراك"; -"XPSessionListHeadView3" = "اكتشاف مبتدئين جدد"; + "NIMTimeUtils1" = "أمس"; "NIMTimeUtils3" = "قبل يومين"; "NIMTimeUtils4" = "فجر"; @@ -631,7 +666,7 @@ "XPLoginViewController3" = "الموافقة على 《الافتراضي》 والموافقة على %@ للحصول على رقم هاتفك المحمول"; "XPLoginViewController4" = "تم تسجيل الدخول بنجاح"; "XPLoginViewController5" = "تسجيل الدخول برقم الهاتف"; -"XPLoginViewController6" = "موافق"; +"XPLoginViewController6" = "موافق《اتفاقية خدمة المستخدم》و《سياسة الخصوصية》"; "XPLoginViewController7" = "《اتفاقية خدمة المستخدم》"; "XPLoginViewController8" = "و"; "XPLoginViewController9" = "《سياسة الخصوصية》"; @@ -713,10 +748,10 @@ "StatisticsServiceHelper3" = "تسجيل الدخول من QQ"; "StatisticsServiceHelper4" = "تسجيل الدخول من WeChat"; "StatisticsServiceHelper5" = "حفظ معلومات التسجيل عند التسجيل"; -"StatisticsServiceHelper6" = "النقر على فتح النبلاء"; -"StatisticsServiceHelper7" = "النقر على مدخل غرفة النبلاء"; -"StatisticsServiceHelper8" = "النقر على لوحة الهدايا النبلاء"; -"StatisticsServiceHelper9" = "النقر على لوحة الرموز التعبيرية النبلاء"; +"StatisticsServiceHelper6" = "النقر على فتح VIP"; +"StatisticsServiceHelper7" = "النقر على مدخل غرفة VIP"; +"StatisticsServiceHelper8" = "النقر على لوحة الهدايا VIP"; +"StatisticsServiceHelper9" = "النقر على لوحة الرموز التعبيرية VIP"; "StatisticsServiceHelper10" = "النقر على صفحة نبلاء الخاصة بي"; "SDPhotoBrowser0" = "حفظ"; @@ -1549,7 +1584,7 @@ ineHeadView12" = "الحمل"; "XPAcrpssRoomPKPanelView1" = "1) يفوز الطرف الذي يحصل على أعلى قيمة للهدايا بالنقاط (1 نقطة = 1 نقدية). \n 2) بعد انتهاء المنافسة، إذا كان الفارق في النقاط ≥ 1314 أو كان إجمالي نقاط الفريقين ≥ 15000 (باستثناء التعادل)، سيتم عرض نتائج المنافسة في الغرف ذات نفس النوع مع الفائز؛ إذا كان الفارق في النقاط ≥ 5200 أو كان إجمالي نقاط الفريقين ≥ 30000 . "; "XPAcrpssRoomPKPanelView2" = "المساهمة"; -"XPAcrpssRoomPKPanelView3" = "الانتقال لمشاهدة البث"; +"XPAcrpssRoomPKPanelView3" = "شاهد"; "XPAcrpssRoomPKPanelView4" = "المتفوق"; "XPAcrpssRoomPKPanelView5" = "الجاذبية"; @@ -1557,8 +1592,8 @@ ineHeadView12" = "الحمل"; "XPAcrossRoomPKCountDownView0" = "PK القادم"; -"XPAcrossRoomPKPrizeView0" = "الانتقال لمشاهدة البث"; -"XPAcrossRoomPKPrizeView1" = "تفضل بمشاهدة البث"; +"XPAcrossRoomPKPrizeView0" = "شاهد"; +"XPAcrossRoomPKPrizeView1" = "شاهد"; "XPAcrossRoomPKResultView0" = "قيمة المتفوق"; "XPAcrossRoomPKResultView1" = "قيمة الجاذبية"; @@ -1610,6 +1645,7 @@ ineHeadView12" = "الحمل"; "XPUserCardPresenter20" = "إضافة إلى القائمة السوداء"; "XPUserCardPresenter21" = "موقع المضيف"; +"XPUserCardPresenter22" = "@هم"; "XPUserCardViewController0" = "المستخدم غير متواجد في الغرفة"; "XPUserCardViewController1" = "تم حظر المستخدم بالفعل"; @@ -1935,7 +1971,7 @@ ineHeadView12" = "الحمل"; "XPRoomMessageContainerView6" = "يوجد رسائل جديدة في الأسفل"; "XPRoomMessageContainerView7" = "يتم @ إليك شخص"; -"XPRoomMessageHeaderView0" = "يحظر المنصة بشدة بث القاصرين أو إعطاء الهدايا لهم، وتدعم التفاعل الأخضر، وتحظر الإعلانات أو المحتويات غير القانونية أو الغير لائقة أو العنف أو الإباحية، وتحظر بشدة المعاملات غير القانونية والتحريض على الغش، وفي حالة الانتهاك سيتم حظر الحسابات، يرجى الإبلاغ عن أي انتهاك فوراً"; +"XPRoomMessageHeaderView0" = "تعمل المنصة على تعزيز التفاعلات الودية وتحظر ترويج ونشر المحتوى غير القانوني. الأنشطة الاحتيالية ضد المستخدمين ممنوعة منعا باتا. أي انتهاكات ستؤدي إلى تعليق الحساب. يرجى الإبلاغ عن أي انتهاكات على وجه السرعة.;"; "XPRoomMessageParser0" = "أنا:"; "XPRoomMessageParser1" = " يتبع "; @@ -1999,7 +2035,7 @@ ineHeadView12" = "الحمل"; "XPRoomMessageParser78" = "حصل على"; "XPRoomMessageParser79" = "(مرئي فقط للنفس)"; "XPRoomMessageParser80" = "الVIP يحين! تهانينا"; -"XPRoomMessageParser81" = "افتتاح نظام النبلاء، حصل على"; +"XPRoomMessageParser81" = "افتتاح نظام VIP، حصل على"; "XPRoomMessageParser82" = "هوية الVIP!"; "XPRoomMessageParser83" = "هتافات الحضور!! تهانينا"; "XPRoomMessageParser84" = "ترقية الهوية الVIPة ل"; @@ -2043,7 +2079,7 @@ ineHeadView12" = "الحمل"; "XPRoomMessageParser120"="ملحمة"; "XPRoomMessageParser121"="مبتدئ"; "XPRoomMessageParser122"="استدعاء"; -"XPRoomMessageParser123"="الماس"; +"XPRoomMessageParser123"="عملة"; "XPRoomMessageParser124"="【الانضمام】"; "XPRoomMessageParser125"="في الطاقة المفرطة في الطرطانة الحظ، حصل"; @@ -2062,7 +2098,7 @@ ineHeadView12" = "الحمل"; "XPGiftHeadTypeView1" = "هدية التجديد الأولى"; "XPGiftHeadTypeView2" = "الهدايا"; "XPGiftHeadTypeView3" = "التفاعل"; -"XPGiftHeadTypeView4" = "مركز النبلاء"; +"XPGiftHeadTypeView4" = "مركز VIP"; "XPGiftLuckyGiftBroadcastCell0" = "تهاني "; "XPGiftLuckyGiftBroadcastCell1" = "فتح %@ واحصل على "; @@ -2102,7 +2138,7 @@ ineHeadView12" = "الحمل"; "XPGiftInfoView6" = "هدية الرسم"; "XPGiftInfoView7" = "هدية العقاب"; "XPGiftInfoView8" = "شعبية"; -"XPGiftInfoView9" = "النبلاء"; +"XPGiftInfoView9" = "VIP"; "XPGiftCountView0" = "قيمة أخرى"; "XPGiftCountView1" = "الكل"; "XPGiftCountView2" = "قيمة أخرى"; @@ -2124,7 +2160,7 @@ ineHeadView12" = "الحمل"; "XPRoomFaceViewController0" = "فشل التحميل، يرجى المحاولة مرة أخرى"; "XPRoomFaceViewController1" = "لم تصل بعد إلى مستوى الVIP المطلوب لإرسال %@،\n المستوى الVIP المطلوب: %@"; "XPRoomFaceViewController2" = "الرموز التعبيرية"; -"XPRoomFaceViewController3" = "رموز تعبيرية النبلاء"; +"XPRoomFaceViewController3" = "رموز تعبيرية VIP"; "XPSailingAnimationView0" = "عظيم!"; "XPSailingAnimationView1" = "حصل على"; @@ -2205,11 +2241,12 @@ ineHeadView12" = "الحمل"; "XPRoomAnchorRankBannerView0" = "تهانينا %@ لتصبح الأول في قائمة الساعة لهذه الفترة"; "XPRoomAnchorRankBannerView1" = "الأول في قائمة الساعة"; -"XPRoomLuckyBigPrizeView0" = "%@ حظه مفتوح! في %@ اكتسب %@ %@ بقيمة"; +"XPRoomLuckyBigPrizeView0" = "حظ ممتاز! ربح %@ عملة بقيمة %@ في %@"; "XPRoomQuickMessageContainView0" = "أرسلت رسائل بشكل متكرر جدًا، يرجى المحاولة لاحقًا"; "AnchorRoomSrollTipView0" = "اسحب لأعلى لاكتشاف المزيد من الغرف المثيرة"; +"XPRoomMessageParser111" = "  مكافأة  "; "XPRoomRedPacketPwdView0" = "الرجاء إدخال كلمة المرور"; "XPRoomRedPacketPwdView1" = "نسيت كلمة المرور؟"; @@ -2486,10 +2523,7 @@ ineHeadView12" = "الحمل"; "XPSessionListHeadFriendCell0" = "البث المباشر"; -"XPSessionListHeadView0" = "إعلان رسمي"; -"XPSessionListHeadView1" = "إشعار الفعالية"; -"XPSessionListHeadView2" = "تنبيه الاشتراك"; -"XPSessionListHeadView3" = "اكتشاف المبتدئين"; + "NIMTimeUtils1" = "أمس"; "NIMTimeUtils3" = "أول أمس"; @@ -2811,11 +2845,7 @@ ineHeadView12" = "الحمل"; "XPLoginViewController3" = "الموافقة على \"الافتراضي\" وتفويض %@ للوصول إلى رقم هاتف الجهاز"; "XPLoginViewController4" = "تم تسجيل الدخول بنجاح"; "XPLoginViewController5" = "تسجيل الدخول باستخدام رقم الهاتف"; -"XPLoginViewController6" = "الموافقة"; -"XPLoginViewController7" = "على"; -"XPLoginViewController8" = "اتفاقية خدمة المستخدم"; -"XPLoginViewController9" = "و"; -"XPLoginViewController10" = "سياسة الخصوصية"; + "XPLoginViewController11" = "بعد الموافقة على سياسة الخصوصية واتفاقية الخدمة، يمكنك التسجيل وتسجيل الدخول"; "XPLoginViewController12" = "تسجيل الدخول باستخدام Apple"; "XPLoginViewController13" = "تسجيل الدخول باستخدام Google"; @@ -3096,7 +3126,7 @@ ineHeadView12" = "الحمل"; "XPMineConfirmGiveDiamondView1"="تحويل إلى %@"; "XPMineConfirmGiveDiamondView2"="رسوم"; "XPMineConfirmGiveDiamondView3" = "إجمالي النقود المستهلكة"; -"XPMineConfirmGiveDiamondView4"="الماس"; +"XPMineConfirmGiveDiamondView4"="عملة"; "XPMineConfirmGiveDiamondView5"="تبادل الألماس للحصول على الذهب"; "XPMineConfirmGiveDiamondView6"="%ld ألماس"; "XPMineConfirmGiveDiamondView7"="استهلاك الألماس"; @@ -3109,11 +3139,10 @@ ineHeadView12" = "الحمل"; "XPIncomeRecordView2" = "تحويل النقود"; "XPIncomeRecordView4" = "نقود"; "XPExchangeDiamondsItemView0" = "نقودي: %@"; -"XPExchangeDiamondsView4" = "عدد النقود المحولة لا يمكن أن يتجاوز %ld نقود"; "XPExchangeDiamondsView3" = "على الأقل يجب تحويل %ld نقود"; -"XPIncomeRecordGoldDetailsView1" = "إجمالي دخل الغرفة الحالي: %@ نقود"; + ///XPMineGiveDiamondDetailsCell -"XPMineGiveDiamondDetailsCell0"="الإجمالي المستهلك %@ ماس"; +"XPMineGiveDiamondDetailsCell0"="إجمالي المصروفات %@ من العملات"; ///XPMineChooseGiveGiftView "XPMineChooseGiveGiftView0"="الكمية"; "XPMineChooseGiveGiftView1"="الكل"; @@ -3134,7 +3163,7 @@ ineHeadView12" = "الحمل"; "XPIncomeRecordGoldDetailsHeadView3"="أرباح الألماس"; "XPIncomeRecordGoldDetailsHeadView4"= "الألماس المتاح للتسوية"; -"XPNobleCenterViewController0" = "%.2f افتح الامتيازات النبلاء فورًا"; +"XPNobleCenterViewController0" = "%.2f افتح الامتيازات VIP فورًا"; "XPNobleCenterViewController1" = "فشل الشراء"; "XPNobleCenterViewController2" = "حدث خطأ غير معروف، يرجى المحاولة مرة أخرى"; "XPNobleCenterViewController3" = "رصيد النقود غير كاف، هل ترغب في إعادة الشحن"; @@ -3163,28 +3192,28 @@ ineHeadView12" = "الحمل"; "XPNobleCenterWindow0"="إعادة شحن"; "XPNobleCenterWindow1"="أنت حاليًا في المستوى %@، هل ترغب في شراء المستوى %@ الأعلى؟"; ///XPNobleSettingNavView.m -"XPNobleSettingNavView0" = "إعدادات النبلاء"; +"XPNobleSettingNavView0" = "إعدادات VIP"; ///XPNobleCenterNavView.m -"XPNobleCenterNavView0" = "مركز النبلاء"; +"XPNobleCenterNavView0" = "مركز VIP"; ///XPNobleCenterTableHeadView.m "XPNobleCenterTableHeadView0" = "قيمة السلطة الحالية: %zd"; -"XPNobleCenterTableHeadView1" = "لم يتم فتح النبلاء بعد"; +"XPNobleCenterTableHeadView1" = "لم يتم فتح VIP بعد"; "XPNobleCenterTableHeadView2" = "قيمة السلطة الحالية:"; //XPNobleCenterResidueView.m "XPNobleCenterResidueView0" = "تفاصيل الوقت المتبقي"; -"XPNobleCenterResidueView1" = "الوقت المتبقي مقسم إلى دورة 30 يومًا، حيث يتم احتساب الوقت المتبقي من يوم بعد الفوز بمستوى جديد من النبلاء لمدة 30 يومًا تبدأ من اليوم التالي بعد الفوز بالمستوى الجديد وتنتهي في اليوم الثلاثين عند الظهر 12:00، وإذا تغير مستوى النبلاء خلال الدورة، فإن الوقت المتبقي سيتم إعادة تعيينه تلقائيًا إلى 30 يومًا."; +"XPNobleCenterResidueView1" = "الوقت المتبقي مقسم إلى دورة 30 يومًا، حيث يتم احتساب الوقت المتبقي من يوم بعد الفوز بمستوى جديد من VIP لمدة 30 يومًا تبدأ من اليوم التالي بعد الفوز بالمستوى الجديد وتنتهي في اليوم الثلاثين عند الظهر 12:00، وإذا تغير مستوى VIP خلال الدورة، فإن الوقت المتبقي سيتم إعادة تعيينه تلقائيًا إلى 30 يومًا."; ///XPNobleUpgradeLevelView.m "XPNobleUpgradeLevelView0" = "تم الترقية!"; "XPNobleUpgradeLevelView1" = "الاحتفاظ بالزي الحالي"; "XPNobleUpgradeLevelView2" = "ارتداء زي مستوى عالٍ"; -"XPNobleUpgradeLevelView3" = "الانتقال إلى مركز النبلاء"; +"XPNobleUpgradeLevelView3" = "الانتقال إلى مركز VIP"; "XPNobleUpgradeLevelView4" = "تهانينا! لقد أصبحت '%@'! تم تعيين الزي الحالي تلقائيًا، هل ترغب في الاحتفاظ بالزي الحالي؟"; ///XPNobleCenterEntranceView.m "XPNobleCenterEntranceView0" = "تبقى %@ قيمة السلطة للترقية"; -"XPNobleCenterEntranceView1" = "مركز النبلاء"; +"XPNobleCenterEntranceView1" = "مركز VIP"; "XPNobleCenterEntranceView2" = "افتح واستمتع بجميع الامتيازات"; ///XPNobleCenterPayView "XPNobleCenterPayView0" = "الدفع"; @@ -3193,11 +3222,11 @@ ineHeadView12" = "الحمل"; "XPNobleCenterPayView2" = "دفع بالنقود"; "XPNobleCenterPayView3" = "تأكيد الدفع"; ///XPNoblePrivilegeContentCell -"XPNoblePrivilegeContentCell0"="امتيازات النبلاء"; -"XPNoblePrivilegeContentCell1"="امتياز الإرجاع"; +"XPNoblePrivilegeContentCell0"="امتياز"; +"XPNoblePrivilegeContentCell1"="خصم"; //PINobleCenterListCell "PINobleCenterListCell0"="استلام"; -"PINobleCenterListCell1"="لم يتم تحقيق معايير الاستلام بعد"; +"PINobleCenterListCell1"="غير مؤهل"; "PINobleCenterListCell2"="اسم المستوى"; "PINobleCenterListCell3"="تاريخ الاسترداد"; "PINobleCenterListCell4"="عدد عملات الخصم"; @@ -3267,13 +3296,13 @@ ineHeadView12" = "الحمل"; "XPTreasureFairySendRecordCell1"="قمت بإهداء %@ بطاقة \"%@\" للجني"; "XPTreasureFairySendRecordCell2"="%@ قدم لك بطاقة \"%@\" للجني"; ///XPTreasureFairyShopingExchangeCell -"XPTreasureFairyShopingExchangeCell0"="ماس"; +"XPTreasureFairyShopingExchangeCell0"="عملة"; "XPTreasureFairyShopingExchangeCell1"="تبديل"; ///XPTreasureFairyShopingRecordCell "XPTreasureFairyShopingRecordCell0"="استدعاء أولي"; "XPTreasureFairyShopingRecordCell1"="استدعاء أسطوري"; "XPTreasureFairyShopingRecordCell2"="استدعاء نادر"; -"XPTreasureFairyShopingRecordCell3"="%@ ماس"; +"XPTreasureFairyShopingRecordCell3"="%@ عملة"; ///XPTreasureFairyTrialsRecordCell "XPTreasureFairyTrialsRecordCell0"="تجربة أسطورية"; "XPTreasureFairyTrialsRecordCell1"="تحليل الجني"; @@ -3283,7 +3312,7 @@ ineHeadView12" = "الحمل"; "XPTreasureFairyDrawView0"="متبقي %@ نقطة حظ، ستحصل على جني أسطوري إضافي"; "XPTreasureFairyDrawView1"="النقاط الحالية للحظ: %@"; ///XPTreasureFairyExchangeView -"XPTreasureFairyExchangeView0"="ماس"; +"XPTreasureFairyExchangeView0"="عملة"; "XPTreasureFairyExchangeView1"="تنبيه"; "XPTreasureFairyExchangeView2"="تبديل"; "XPTreasureFairyExchangeView3"="سوف تقوم بتبديل \"%@ (%@)\""; @@ -3354,7 +3383,7 @@ ineHeadView12" = "الحمل"; "XPTreasureFairyStoreView8"="واحد"; "XPTreasureFairyStoreView9"="عشرة"; ///XPTreasureFairySummonGiftView -"XPTreasureFairySummonGiftView0"="%ld الألماس"; +"XPTreasureFairySummonGiftView0"="%ld عملة"; ///XPTreasureFairySummonView "XPTreasureFairySummonView0"="تهانينا للحصول على"; ///XPTreasureFairyTrialsContentView @@ -3401,7 +3430,7 @@ ineHeadView12" = "الحمل"; "XPTreasureFairyGiftView5"="أسطوري"; "XPTreasureFairyGiftView6"="أسطوري"; "XPTreasureFairyGiftView7"="الاستدعاء"; -"XPTreasureFairyGiftView8"="الماس"; +"XPTreasureFairyGiftView8"="عملة"; ///XPMineUserInfoRecordedSoundView "XPMineUserInfoRecordedSoundView0"="الصوت الجيد يمكن أن يجلب المزيد من الانتباه!"; "XPMineUserInfoRecordedSoundView1"="انقر لبدء التسجيل"; @@ -3673,7 +3702,7 @@ ineHeadView12" = "الحمل"; ///PIRoomSendRedPacketItemVC "PIRoomSendRedPacketItemVC0"="قيمة الهدية"; "PIRoomSendRedPacketItemVC1"="عدد الهدايا"; -"PIRoomSendRedPacketItemVC2"="ماس"; +"PIRoomSendRedPacketItemVC2"="عملة"; "PIRoomSendRedPacketItemVC3"="قطعة"; "PIRoomSendRedPacketItemVC4"="فعّل الآن"; "PIRoomSendRedPacketItemVC5"="تفعيل مؤقت"; @@ -3686,7 +3715,7 @@ ineHeadView12" = "الحمل"; ///PIRoomEnterRedPacketView "PIRoomEnterRedPacketView0"="احصل على الهدية"; ///XPRoomGiftBroadcastWindow -"PIRoomGiftBroadcastWindow0"="الذهاب للمشاهدة"; +"PIRoomGiftBroadcastWindow0"="شاهد"; "PIRoomGiftBroadcastWindow1"="هل ترغب في المغادرة إلى الغرفة الحالية؟"; "PIRoomGiftBroadcastWindow2"="عدم ظهور هذه الرسالة في المرة القادمة"; "PIRoomGiftBroadcastWindow3"="البقاء هنا"; @@ -3728,7 +3757,7 @@ ineHeadView12" = "الحمل"; "App_Common_bei" = "من قبل"; "App_Common_gei" = "ل"; "App_Common_nin" = "أنت"; -"App_Common_Year" = "سنة yyyy"; +"App_Common_Year" = "yyyy"; "App_Common_hao" = "رقم"; "MJRefreshHeaderIdleText" = "للتحديث اسحب للأسفل"; diff --git a/YuMi/en.lproj/Localizable.strings b/YuMi/en.lproj/Localizable.strings index d8e9c3b9..48aee343 100644 --- a/YuMi/en.lproj/Localizable.strings +++ b/YuMi/en.lproj/Localizable.strings @@ -94,10 +94,7 @@ "XPSessionListHeadFriendCell0" = "Live"; -"XPSessionListHeadView0" = "Official announcements"; -"XPSessionListHeadView1" = "Event notifications"; -"XPSessionListHeadView2" = "Subscription reminders"; -"XPSessionListHeadView3" = "Discover newbies"; + "NIMTimeUtils1" = "Yesterday"; "NIMTimeUtils3" = "The day before yesterday"; @@ -437,7 +434,7 @@ "XPCandyTreeMoreView4" = "Allow prize messages to be displayed externally"; "XPCandyTreeEmptyableViewCell0" = "No data available"; "XPCandyTreeMoreRuleCell0" = "Fortune value reaches level %ld to use, hurry up and upgrade~"; -"XPCandyTreeViewController0" = "%@ diamonds/time"; + "XPCandyTreeViewController2" = "Cannot buy love with 0 quantity!"; "XPCandyTreeViewController4" = "Join now"; "XPCandyTreeViewController5" = "Only 99999 times can be selected at a time"; @@ -478,11 +475,11 @@ "StatisticsServiceHelper3" = "QQ login"; "StatisticsServiceHelper4" = "WeChat login"; "StatisticsServiceHelper5" = "Personal information saved successfully during registration"; -"StatisticsServiceHelper6" = "Click to open the noble"; -"StatisticsServiceHelper7" = "Noble room entrance clicked"; -"StatisticsServiceHelper8" = "Noble gift panel entrance clicked"; -"StatisticsServiceHelper9" = "Noble expression panel entrance clicked"; -"StatisticsServiceHelper10" = "Noble 'My' page entrance clicked"; +"StatisticsServiceHelper6" = "Click to open the VIP"; +"StatisticsServiceHelper7" = "VIP room entrance clicked"; +"StatisticsServiceHelper8" = "VIP gift panel entrance clicked"; +"StatisticsServiceHelper9" = "VIP expression panel entrance clicked"; +"StatisticsServiceHelper10" = "VIP 'My' page entrance clicked"; "SDPhotoBrowser0" = "Save"; "SDBrowserImageView0" = "Image loading failed"; "NSDate_DateUtils0" = "MM/dd"; @@ -578,7 +575,7 @@ "XPMineAttentionViewController1" = "My Following"; "XPMineAttentionViewController2" = "You haven't followed anyone yet"; "XPIncomeRecordGoldDetailsView0"="No Data Available"; -"XPIncomeRecordGoldDetailsView1"="Total Gold Coins Flow in Current Room: %@ Diamonds"; +"XPIncomeRecordGoldDetailsView1"="Total Gold Coin Flow in Current Room: %@ Coins"; "XPIncomeRecordGoldDetailsVC0"="Diamond Details"; "XPIncomeRecordGoldDetailsVC1"="to"; @@ -1323,7 +1320,7 @@ "XPAcrpssRoomPKPanelView0" = "Calculating PK Results"; "XPAcrpssRoomPKPanelView1" = "1) Points are awarded based on the value of gifts received (1 Coins = 1 point). The side with higher gift value wins.\n2) After the PK, if the score difference is ≥1314 or the total score of both sides is ≥15000 (excluding draws), the PK results will be displayed in rooms of the same type as the winning side; if the score difference is ≥5200 or the total score of both sides is ≥30000 (excluding draws), the PK results will be displayed in all rooms across the platform."; "XPAcrpssRoomPKPanelView2" = "Assist"; -"XPAcrpssRoomPKPanelView3" = "Go Watch"; +"XPAcrpssRoomPKPanelView3" = "Watch"; "XPAcrpssRoomPKPanelView4" = "Big Spender"; "XPAcrpssRoomPKPanelView5" = "Charm"; @@ -1331,7 +1328,7 @@ "XPAcrossRoomPKCountDownView0" = "Next PK"; -"XPAcrossRoomPKPrizeView0" = "Go Watch"; +"XPAcrossRoomPKPrizeView0" = "Watch"; "XPAcrossRoomPKPrizeView1" = "Come Watch"; "XPAcrossRoomPKResultView0" = "Big Spender Value"; @@ -1384,24 +1381,25 @@ "XPUserCardPresenter15" = "Follow"; "XPUserCardPresenter16" = "Followed"; "XPUserCardPresenter17" = "Kick Out"; -"XPUserCardPresenter18" = "Set as Admin"; +"XPUserCardPresenter18" = "Set Admin"; "XPUserCardPresenter19" = "Cancel Admin"; "XPUserCardPresenter20" = "Add to Blacklist"; "XPUserCardPresenter21" = "Host"; +"XPUserCardPresenter22" = "@them"; "XPUserCardViewController0" = "User is not in the room"; "XPUserCardViewController1" = "The user has been blacklisted"; "XPUserCardViewController2" = "Clear successful"; "XPUserCardViewController3" = "Operation successful"; -"XPUserCardViewController4" = "The user is %@ noble, only the host can kick out"; -"XPUserCardViewController5" = "The user is %@ noble. Confirm to kick them out of the room?"; +"XPUserCardViewController4" = "The user is %@ VIP, only the host can kick out"; +"XPUserCardViewController5" = "The user is %@ VIP. Confirm to kick them out of the room?"; "XPUserCardViewController6" = "In game mode, if this player quits the game, do you want to kick them out of the room?"; "XPUserCardViewController7" = "In game mode, if this player quits the game, do you want to kick them out of the room?"; "XPUserCardViewController8" = "Do you want to kick %@ out of the room?"; "XPUserCardViewController9" = "Operation reminder"; -"XPUserCardViewController10" = "The user is %@ noble, only the host can kick them out"; -"XPUserCardViewController11" = "The user is %@ noble. Confirm to blacklist them?"; +"XPUserCardViewController10" = "The user is %@ VIP, only the host can kick them out"; +"XPUserCardViewController11" = "The user is %@ VIP. Confirm to blacklist them?"; "XPUserCardViewController12" = "In game mode, if this player quits the game, do you want to kick them out of the room?"; "XPUserCardViewController13" = "Do you want to add %@ to the blacklist? After adding, they will not be able to enter this room. In game mode, if this player quits the game"; "XPUserCardViewController14" = "You are blacklisting %@"; @@ -1465,7 +1463,7 @@ "XPRoomFunctionContainerView13" = "Start Selection>"; "XPRoomFunctionContainerView18" = "Cannot switch games or gameplay during the game!"; -"XPRoomBackContainerView0" = "Exclusive background image for nobles failed to load"; +"XPRoomBackContainerView0" = "Exclusive background image for VIP failed to load"; "XPRoomBackContainerView1" = "Personal broadcast background image failed to load"; "XPRoomRankEntranceView0" = "Room Ranking"; @@ -1711,7 +1709,7 @@ "XPRoomMessageContainerView6" = "New Messages at Bottom"; "XPRoomMessageContainerView7" = "Someone Mentioned You"; -"XPRoomMessageHeaderView0" = "The platform strictly prohibits minors from live broadcasting or rewarding, advocates green interaction, prohibits propaganda or release of political, vulgar, violent, pornographic and other illegal content, strictly prohibits illegal transactions and fraud, accounts will be banned for violations, please report promptly if found"; +"XPRoomMessageHeaderView0" = "The platform promotes friendly interactions and prohibits the promotion and dissemination of illegal content. Fraudulent activities against users are strictly prohibited. Any violations will result in account suspension. Please report any violations promptly."; "XPRoomMessageParser0" = "Me:"; "XPRoomMessageParser1" = " is driving "; @@ -1792,11 +1790,11 @@ "XPRoomMessageParser77" = "Awesome "; "XPRoomMessageParser78" = "obtained through Love Journey"; "XPRoomMessageParser79" = "(Visible only to yourself)"; -"XPRoomMessageParser80" = "Noble has arrived! Congratulations"; -"XPRoomMessageParser81" = "on opening the noble system, obtaining"; -"XPRoomMessageParser82" = "noble status!"; +"XPRoomMessageParser80" = "VIP has arrived! Congratulations"; +"XPRoomMessageParser81" = "on opening the VIPe system, obtaining"; +"XPRoomMessageParser82" = "VIP status!"; "XPRoomMessageParser83" = "The whole audience cheers!! Congratulations"; -"XPRoomMessageParser84" = "'s noble status successfully upgraded to"; +"XPRoomMessageParser84" = "'s VIP status successfully upgraded to"; "XPRoomMessageParser85" = "Congratulations"; "XPRoomMessageParser86" = "You"; "XPRoomMessageParser87" = "Congratulations"; @@ -1825,8 +1823,8 @@ "XPRoomMessageParser110" = "Coins"; "XPRoomMessageParser111" = "  Reward  "; -"XPRoomMessageParser112" = "Obtained in the Star Chef Kitchen"; -"XPRoomMessageParser113" = "Coins value fragment reward"; + + "XPRoomMessageParser114" = "Management initiates room PK, this PK lasts %.0f seconds, %@"; "XPRoomMessageParser115" = "Impressive! "; @@ -1837,7 +1835,7 @@ "XPRoomMessageParser120" = "Epic"; "XPRoomMessageParser121" = "Primary"; "XPRoomMessageParser122" = "Summon"; -"XPRoomMessageParser123" = "Diamond"; +"XPRoomMessageParser123" = "Coins"; "XPRoomMessageParser124" = "【Join】"; "XPRoomMessageParser125" = "Lucky Tarot brings fortune Bursting with luck in Tarot, obtaining"; @@ -1856,7 +1854,7 @@ "XPGiftHeadTypeView1" = "First Recharge Bonus"; "XPGiftHeadTypeView2" = "Gift"; "XPGiftHeadTypeView3" = "Interactive"; -"XPGiftHeadTypeView4" = "Noble Center"; +"XPGiftHeadTypeView4" = "VIP Center"; "XPGiftLuckyGiftBroadcastCell0" = "Congratulations "; "XPGiftLuckyGiftBroadcastCell1" = "Opened %@, obtained "; @@ -1866,7 +1864,7 @@ "XPSendGiftView1" = "Can only send all to one person"; "XPSendGiftView2" = "Please select at least one person"; "XPSendGiftView3" = "Sent graffiti gift: %@ successfully"; -"XPSendGiftView4" = "Not yet reached the noble level required to send %@\nRequired noble level: %@"; +"XPSendGiftView4" = "Not yet reached the VIP level required to send %@\nRequired VIP level: %@"; "XPGraffitiGiftView0" = "Maximum of 300 drawings allowed"; "XPGraffitiGiftView1" = "At least 10 drawings required to send"; @@ -1893,7 +1891,7 @@ "XPGiftInfoView6" = "Graffiti Gifts"; "XPGiftInfoView7" = "Penalty Gifts"; "XPGiftInfoView8" = "Popular"; -"XPGiftInfoView9" = "Noble"; +"XPGiftInfoView9" = "VIP"; "XPGiftCountView0" = "Other amounts"; "XPGiftCountView1" = "All"; "XPGiftCountView2" = "Other amounts"; @@ -1913,9 +1911,9 @@ "XPGiftWeekStarBroadcastView5" = "Vacant"; "XPRoomFaceViewController0" = "Failed to load, please try again"; -"XPRoomFaceViewController1" = "Not yet reached the noble level required to send %@,\n Required noble level: %@"; +"XPRoomFaceViewController1" = "Not yet reached the VIP level required to send %@,\n Required VIP level: %@"; "XPRoomFaceViewController2" = "Expression"; -"XPRoomFaceViewController3" = "Noble Expression"; +"XPRoomFaceViewController3" = "VIP Expression"; "XPSailingAnimationView0" = "Impressive"; "XPSailingAnimationView1" = "Obtained in sailing adventure"; @@ -1980,7 +1978,7 @@ "XPRoomGiftCompoundView0" = "Congratulations"; "XPRoomNobleLevelUpView0" = "Set the stage on fire! Congratulations "; -"XPRoomNobleLevelUpView1" = "Noble status upgraded to %@!"; +"XPRoomNobleLevelUpView1" = "VIP status upgraded to %@!"; "XPRoomCandyGiftView0" = "Impressive! "; "XPRoomCandyGiftView1" = "Obtained through Love Search "; @@ -1994,7 +1992,7 @@ "XPRoomAnchorRankBannerView0" = "Congratulations %@ on becoming the TOP1 of the hour on the leaderboard"; "XPRoomAnchorRankBannerView1" = "TOP1 of the hour"; -"XPRoomLuckyBigPrizeView0" = "%@ is incredibly lucky! In %@, opened a %@ worth %@"; +"XPRoomLuckyBigPrizeView0" = "%@ Amazing Luck! Opened a %@ worth %@ Coins in %@"; "XPRoomQuickMessageContainView0" = "You are sending too frequently, please try again later"; @@ -2100,7 +2098,7 @@ "XPRoomLotteryPrizeView4" = "Congratulations %@ on winning the second prize!"; "XPRoomLotteryPrizeView5" = "Congratulations %@ on winning the third prize!"; "XPRoomLotteryPrizeView6" = "Congratulations %@ on winning the %@ prize!"; -"XPRoomLotteryPrizeView7" = "%@ drew a prize and got %@ coins"; +"XPRoomLotteryPrizeView7" = "%@ drew a prize and got %@ Coins"; "XPRoomLotteryPrizeView8" = "Congratulations %@ on winning the grand prize!"; "XPRoomLotteryPrizeView9" = "Congratulations %@ on winning the first prize!"; "XPRoomLotteryPrizeView10" = "Congratulations %@ on winning the second prize!"; @@ -2299,7 +2297,7 @@ "XPLoginViewController3" = "Agree to the default and authorize %@ to access the current phone number"; "XPLoginViewController4" = "Login successful"; "XPLoginViewController5" = "Phone Number Login"; -"XPLoginViewController6" = "Agree "; +"XPLoginViewController6" = "Agree User Service Agreement and Privacy Policy"; "XPLoginViewController7" = "User Service Agreement"; "XPLoginViewController8" = " and "; "XPLoginViewController9" = "Privacy Policy"; @@ -2584,8 +2582,8 @@ "XPMinePromptWindow2" = "Cancel"; "XPMinePromptWindow3" = "Confirm"; -"XPMineExchangeAuthorityFooderView0" = "No more members who cannot exchange diamonds coins temporarily~"; -"XPMineExchangeAuthorityFooderView1" = "No more members who can exchange diamonds coins temporarily~"; +"XPMineExchangeAuthorityFooderView0" = "No more members who cannot exchange diamonds Coins temporarily~"; +"XPMineExchangeAuthorityFooderView1" = "No more members who can exchange diamonds Coins temporarily~"; ///XPMineGuildListCell "XPMineGuildListCell0" = "Apply to join"; @@ -2615,6 +2613,12 @@ "XPMineGuildIncomeStatisViewController1" = "Daily Statistics"; "XPMineGuildIncomeStatisViewController2" = "Weekly Statistics"; "XPMineGuildIncomeStatisViewController3" = "Diamonds Details"; +"XPMineGoldIncomeRecordVC0"="No more data available~"; +"XPGoldIncomeSectionView0" = "Ranking"; +"XPIncomeRecordGoldDetailsHeadView1" = "Member"; +"XPIncomeRecordGoldDetailsHeadView3" = "Diamond Earnings"; +"XPIncomeRecordGoldDetailsHeadView4" = "Settleable Diamonds"; +"XPIncomeRecordGoldDetailsHeadView5" = "Total Income (Gold Coins)"; ///XPMineGuildIncomeDetailViewController.m "XPMineGuildIncomeDetailViewController0" = "Income Details"; @@ -2728,8 +2732,8 @@ "XPGuildSuperAdminSetTableViewCell1" = "Managed Rooms"; ///XPGuildSearchSuperAdminTableViewCell.m -"XPGuildSearchSuperAdminTableViewCell0" = "Set as Super Admin"; -"XPGuildSearchSuperAdminTableViewCell1" = "Already Set as Super Admin"; +"XPGuildSearchSuperAdminTableViewCell0" = "Set Super Admin"; +"XPGuildSearchSuperAdminTableViewCell1" = "Made Super Admin"; ///XPGuildIncomeDetailCollectionViewCell.m "XPGuildIncomeDetailCollectionViewCell0" = "Coins"; @@ -2915,7 +2919,7 @@ "XPMineConfirmGiveDiamondView1"="Gift to %@"; "XPMineConfirmGiveDiamondView2"="Service Fee"; "XPMineConfirmGiveDiamondView3"="Total Coins Consumed"; -"XPMineConfirmGiveDiamondView4"="Diamonds"; +"XPMineConfirmGiveDiamondView4"="Coins"; "XPMineConfirmGiveDiamondView5"="Exchange Diamonds for Coins"; "XPMineConfirmGiveDiamondView6"="%ld Diamonds"; "XPMineConfirmGiveDiamondView7"="Diamonds Consumed"; @@ -2927,7 +2931,7 @@ "XPMineGiveDiamondDetailsVC2"="Gifts"; ///XPMineGiveDiamondDetailsCell -"XPMineGiveDiamondDetailsCell0"="Total Expenditure %@ Diamonds"; +"XPMineGiveDiamondDetailsCell0"="Total Spend %@ Coins"; ///XPMineChooseGiveGiftView "XPMineChooseGiveGiftView0"="Quantity"; "XPMineChooseGiveGiftView1"="All"; @@ -3001,16 +3005,16 @@ "XPIncomeRecordCoinsDetailsPickViewView4"="Month"; "XPIncomeRecordCoinsDetailsPickViewView5"="Day"; -"XPNobleSettingViewController0" = "Noble Setting"; +"XPNobleSettingViewController0" = "VIP Setting"; "XPNobleSettingViewController1" = "Enter Room Anonymously"; -"XPNobleCenterViewController0" = "%.2f Immediately Open Noble Privileges"; +"XPNobleCenterViewController0" = "%.2f Immediately Open VIP Privileges"; "XPNobleCenterViewController1" = "Purchase Failed"; "XPNobleCenterViewController2" = "Unknown error occurred, please try again"; "XPNobleCenterViewController3" = "Insufficient Coins Balance, Do you want to recharge"; "XPNobleCenterMyNobleView0" = "Current Level"; -"XPNobleCenterMyNobleView1" = " has reached the highest usable noble level"; +"XPNobleCenterMyNobleView1" = " has reached the highest usable VIP level"; "XPNobleCenterMyNobleView2" = " still needs:"; "XPNobleCenterMyNobleView3" = "Power values can be upgraded to"; "XPNobleCenterMyNobleView4" = " Remaining time:"; @@ -3027,25 +3031,25 @@ "XPNobleCenterWindow0"="Recharge"; "XPNobleCenterWindow1"="You are currently at %@ level, confirm to purchase a higher %@ level"; -"XPNobleSettingNavView0" = "Noble Setting"; +"XPNobleSettingNavView0" = "VIP Setting"; -"XPNobleCenterNavView0" = "Noble Center"; +"XPNobleCenterNavView0" = "VIP Center"; "XPNobleCenterTableHeadView0" = "Current Power Value: %zd"; -"XPNobleCenterTableHeadView1" = "Noble Not Activated Yet"; +"XPNobleCenterTableHeadView1" = "VIP Not Activated Yet"; "XPNobleCenterTableHeadView2" = "Current Power Value:"; "XPNobleCenterResidueView0" = "Remaining Time Explanation"; -"XPNobleCenterResidueView1" = "The remaining time is calculated based on a 30-day cycle. The next day after obtaining a new noble level, it starts counting 30 days from noon 12:00 on the next day as the deadline. If the noble level changes within the cycle, the remaining time will automatically reset to 30 days."; +"XPNobleCenterResidueView1" = "The remaining time is calculated based on a 30-day cycle. The next day after obtaining a new VIP level, it starts counting 30 days from noon 12:00 on the next day as the deadline. If the VIP level changes within the cycle, the remaining time will automatically reset to 30 days."; "XPNobleUpgradeLevelView0" = "Level Up!"; "XPNobleUpgradeLevelView1" = "Keep Original Outfit"; "XPNobleUpgradeLevelView2" = "Wear Higher Level Outfit"; -"XPNobleUpgradeLevelView3" = "Go to Noble Center"; +"XPNobleUpgradeLevelView3" = "Go to VIP Center"; "XPNobleUpgradeLevelView4" = "Congratulations on becoming '%@'! The current level outfit has been automatically worn. Do you want to keep the original outfit?"; "XPNobleCenterEntranceView0" = "%@ Points to Upgrade"; -"XPNobleCenterEntranceView1" = "Noble Center"; +"XPNobleCenterEntranceView1" = "VIP Center"; "XPNobleCenterEntranceView2" = "Open to enjoy various privileges"; "XPNobleCenterPayView0" = "Payment"; @@ -3070,7 +3074,7 @@ "PINobleCenterListView0"="Users directly purchase %@ level, in addition to directly enjoying all corresponding privileges, they can also receive additional rebates.\n\nSpecific rebate dates and rebate Coins quantities are as follows:"; -"PINobleCenterListView1"="Note:\nThe rebate Coins must be collected within 30 days after the noble is opened, otherwise it will be invalid.\nThe collected rebate Coins can be viewed in [My-Earnings Record-Coins Details-Income Record]."; +"PINobleCenterListView1"="Note:\nThe rebate Coins must be collected within 30 days after the VIP is opened, otherwise it will be invalid.\nThe collected rebate Coins can be viewed in [My-Earnings Record-Coins Details-Income Record]."; "LoginForgetEditView0" = "Get Verification Code"; @@ -3124,13 +3128,13 @@ "XPTreasureFairySendRecordCell1"="You gave %@ a '%@' fairy card"; "XPTreasureFairySendRecordCell2"="%@ gave you a '%@' fairy card"; -"XPTreasureFairyShopingExchangeCell0"="Diamonds"; +"XPTreasureFairyShopingExchangeCell0"="Coins"; "XPTreasureFairyShopingExchangeCell1"="Exchange"; "XPTreasureFairyShopingRecordCell0"="Primary Summon"; "XPTreasureFairyShopingRecordCell1"="Epic Summon"; "XPTreasureFairyShopingRecordCell2"="Legendary Summon"; -"XPTreasureFairyShopingRecordCell3"="%@ Diamonds"; +"XPTreasureFairyShopingRecordCell3"="%@ Coins"; "XPTreasureFairyTrialsRecordCell0"="Legendary Trial"; "XPTreasureFairyTrialsRecordCell1"="Fairy Decomposition"; @@ -3140,7 +3144,7 @@ "XPTreasureFairyDrawView0"="Still need %@ Lucky Points, and receive a legendary fairy as a bonus"; "XPTreasureFairyDrawView1"="Current Lucky Points: %@"; -"XPTreasureFairyExchangeView0"="Diamonds"; +"XPTreasureFairyExchangeView0"="Coins"; "XPTreasureFairyExchangeView1"="Tip"; "XPTreasureFairyExchangeView2"="Exchange"; "XPTreasureFairyExchangeView3"="You are about to exchange \"%@(%@)\""; @@ -3208,7 +3212,7 @@ "XPTreasureFairyStoreView8"="One"; "XPTreasureFairyStoreView9"="Ten"; -"XPTreasureFairySummonGiftView0"="%ld Diamonds"; +"XPTreasureFairySummonGiftView0"="%ld Coins"; "XPTreasureFairySummonView0"="Congratulations on obtaining"; @@ -3254,7 +3258,7 @@ "XPTreasureFairyGiftView5"="Epic"; "XPTreasureFairyGiftView6"="Legendary"; "XPTreasureFairyGiftView7"="Summon"; -"XPTreasureFairyGiftView8"="Diamond"; +"XPTreasureFairyGiftView8"="Coins"; ///XPMineUserInfoRecordedSoundView "XPMineUserInfoRecordedSoundView0"="Good voice can bring more attention~"; "XPMineUserInfoRecordedSoundView1"="Click to start recording"; @@ -3513,7 +3517,7 @@ ///PIRoomSendRedPacketItemVC "PIRoomSendRedPacketItemVC0"="Red Packet Amount"; "PIRoomSendRedPacketItemVC1"="Red Packet Quantity"; -"PIRoomSendRedPacketItemVC2"="Diamonds"; +"PIRoomSendRedPacketItemVC2"="Coins"; "PIRoomSendRedPacketItemVC3"="pcs"; "PIRoomSendRedPacketItemVC4"="Effective Immediately"; "PIRoomSendRedPacketItemVC5"="Effective for a Limited Time"; @@ -3526,7 +3530,7 @@ ///PIRoomEnterRedPacketView "PIRoomEnterRedPacketView0"="Snatch Red Packet"; ///XPRoomGiftBroadcastWindow -"PIRoomGiftBroadcastWindow0"="Go to Watch"; +"PIRoomGiftBroadcastWindow0"="Watch"; "PIRoomGiftBroadcastWindow1"="Leave current room and go to"; "PIRoomGiftBroadcastWindow2"="Don't show this prompt again next time"; "PIRoomGiftBroadcastWindow3"="Stay Here"; @@ -3567,7 +3571,7 @@ "App_Common_bei" = "By"; "App_Common_gei" = "To"; "App_Common_nin" = "You"; -"App_Common_Year" = "yyyy Year"; +"App_Common_Year" = "yyyy"; "App_Common_hao" = "Number"; diff --git a/YuMi/zh-Hans.lproj/Localizable.strings b/YuMi/zh-Hans.lproj/Localizable.strings index f736df57..280375b2 100644 --- a/YuMi/zh-Hans.lproj/Localizable.strings +++ b/YuMi/zh-Hans.lproj/Localizable.strings @@ -23,7 +23,7 @@ "XPCandyTreeMoreRuleCell0" = "财富值达到%ld级可用，快去升级吧~"; ///XPCandyTreeViewController.m -"XPCandyTreeViewController0" = "%@钻/次"; + "XPCandyTreeViewController2" = "购买爱心数量不能为0！"; "XPCandyTreeViewController4" = "去参与"; "XPCandyTreeViewController5" = "一次只能选择99999次"; @@ -997,7 +997,7 @@ "XPUserCardPresenter20" = "拉入黑名单"; "XPUserCardPresenter21" = "主持位"; - +"XPUserCardPresenter22" = "@TA"; "XPUserCardViewController0" = "用户不在房间内"; @@ -1327,7 +1327,7 @@ "XPRoomMessageContainerView6" = "底部有新消息"; "XPRoomMessageContainerView7" = "有人@你"; -"XPRoomMessageHeaderView0" = "平台严禁未成年人直播或打赏，倡导绿色互动，禁止宣传及发佈政治、低俗、暴力、色情等违规违法内容，严禁违规交易和诱导欺诈用户，如有违规将对账号进行封禁，发现请及时举报"; +"XPRoomMessageHeaderView0" = "平台倡导友善互动，禁止宣传及发佈违规违法内容，严禁欺诈用户，如有违规将进行帐号封禁，如有违规请及时举报。"; "XPRoomMessageParser0" = "我:"; "XPRoomMessageParser1" = " 驾著 "; @@ -1453,7 +1453,7 @@ "XPRoomMessageParser120"="史诗"; "XPRoomMessageParser121"="初级"; "XPRoomMessageParser122"="召唤"; -"XPRoomMessageParser123"="钻"; +"XPRoomMessageParser123"="金币"; "XPRoomMessageParser124"="【去参加】"; "XPRoomMessageParser125"="在幸运塔罗中运气爆发 获得"; @@ -1623,7 +1623,7 @@ -"XPRoomLuckyBigPrizeView0" = "%@运气爆表！在%@ 中开出了价值 %@钻 的 %@"; +"XPRoomLuckyBigPrizeView0" = "%@运气爆表！在%@ 中开出了价值 %@金币 的 %@"; @@ -1904,10 +1904,7 @@ "XPSessionListHeadFriendCell0" = "直播"; -"XPSessionListHeadView0" = "官方公告"; -"XPSessionListHeadView1" = "活动通知"; -"XPSessionListHeadView2" = "订阅提醒"; -"XPSessionListHeadView3" = "发现萌新"; + "NIMTimeUtils1" = "昨天"; "NIMTimeUtils3" = "前天"; @@ -2189,7 +2186,7 @@ "XPLoginViewController3" = "同意《默认》，并授权%@获取本机号码"; "XPLoginViewController4" = "登录成功"; "XPLoginViewController5" = "手机号码登录"; -"XPLoginViewController6" = "同意"; +"XPLoginViewController6" = "同意《用户服务协议》和《隐私政策》"; "XPLoginViewController7" = "《用户服务协议》"; "XPLoginViewController8" = "和"; "XPLoginViewController9" = "《隐私政策》"; @@ -2576,7 +2573,7 @@ "XPMineConfirmGiveDiamondView1"="向%@转赠"; "XPMineConfirmGiveDiamondView2"="手续费"; "XPMineConfirmGiveDiamondView3"="总消耗金币"; -"XPMineConfirmGiveDiamondView4"="钻"; +"XPMineConfirmGiveDiamondView4"="金币"; "XPMineConfirmGiveDiamondView5"="兑换钻石获得金币"; "XPMineConfirmGiveDiamondView6"="%ld钻石"; "XPMineConfirmGiveDiamondView7"="消耗钻石"; @@ -2588,7 +2585,7 @@ "XPMineGiveDiamondDetailsVC2"="礼物"; ///XPMineGiveDiamondDetailsCell -"XPMineGiveDiamondDetailsCell0"="总支出%@钻"; +"XPMineGiveDiamondDetailsCell0"="总支出%@金币"; ///XPMineChooseGiveGiftView "XPMineChooseGiveGiftView0"="数量"; "XPMineChooseGiveGiftView1"="全部"; @@ -2638,7 +2635,7 @@ "XPExchangeDiamondsView5"="兑换成功"; "XPIncomeRecordGoldDetailsView0"="暂没有数据"; -"XPIncomeRecordGoldDetailsView1"="当前房间总计金币流水:%@钻"; +"XPIncomeRecordGoldDetailsView1"="当前房间总计金币流水:%@金币"; "XPIncomeRecordGoldDetailsVC0"="钻石明细"; "XPIncomeRecordGoldDetailsVC1"="至"; @@ -2782,13 +2779,13 @@ "XPTreasureFairySendRecordCell1"="你赠送%@一张“%@“精灵卡"; "XPTreasureFairySendRecordCell2"="%@赠送了你一张“%@“精灵卡"; ///XPTreasureFairyShopingExchangeCell -"XPTreasureFairyShopingExchangeCell0"="钻"; +"XPTreasureFairyShopingExchangeCell0"="金币"; "XPTreasureFairyShopingExchangeCell1"="兑换"; ///XPTreasureFairyShopingRecordCell "XPTreasureFairyShopingRecordCell0"="初级召唤"; "XPTreasureFairyShopingRecordCell1"="史诗召唤"; "XPTreasureFairyShopingRecordCell2"="传说召唤"; -"XPTreasureFairyShopingRecordCell3"="%@钻"; +"XPTreasureFairyShopingRecordCell3"="%@金币"; ///XPTreasureFairyTrialsRecordCell "XPTreasureFairyTrialsRecordCell0"="传说试炼"; "XPTreasureFairyTrialsRecordCell1"="精灵分解"; @@ -2798,7 +2795,7 @@ "XPTreasureFairyDrawView0"="还差 %@ 幸运值,额外获赠传说精灵"; "XPTreasureFairyDrawView1"="当前幸运值： %@"; ///XPTreasureFairyExchangeView -"XPTreasureFairyExchangeView0"="钻"; +"XPTreasureFairyExchangeView0"="金币"; "XPTreasureFairyExchangeView1"="提示"; "XPTreasureFairyExchangeView2"="兑换"; "XPTreasureFairyExchangeView3"="您将要兑换“%@(%@)”"; @@ -2867,7 +2864,7 @@ "XPTreasureFairyStoreView8"="一"; "XPTreasureFairyStoreView9"="十"; ///XPTreasureFairySummonGiftView -"XPTreasureFairySummonGiftView0"="%ld钻"; +"XPTreasureFairySummonGiftView0"="%ld金币"; ///XPTreasureFairySummonView "XPTreasureFairySummonView0"="恭喜获得"; ///XPTreasureFairyTrialsContentView @@ -2913,7 +2910,7 @@ "XPTreasureFairyGiftView5"="史诗"; "XPTreasureFairyGiftView6"="传说"; "XPTreasureFairyGiftView7"="召唤"; -"XPTreasureFairyGiftView8"="钻"; +"XPTreasureFairyGiftView8"="金币"; ///XPMineUserInfoRecordedSoundView "XPMineUserInfoRecordedSoundView0"="好的声音能带来更多关注哦~"; "XPMineUserInfoRecordedSoundView1"="点击开始录制"; @@ -3182,7 +3179,7 @@ ///PIRoomSendRedPacketItemVC "PIRoomSendRedPacketItemVC0"="红包金额"; "PIRoomSendRedPacketItemVC1"="红包数量"; -"PIRoomSendRedPacketItemVC2"="钻"; +"PIRoomSendRedPacketItemVC2"="金币"; "PIRoomSendRedPacketItemVC3"="个"; "PIRoomSendRedPacketItemVC4"="立即生效"; "PIRoomSendRedPacketItemVC5"="限时生效"; diff --git a/YuMi/zh-Hant.lproj/Localizable.strings b/YuMi/zh-Hant.lproj/Localizable.strings index 6b355e7b..770c58a5 100644 --- a/YuMi/zh-Hant.lproj/Localizable.strings +++ b/YuMi/zh-Hant.lproj/Localizable.strings @@ -23,7 +23,7 @@ "XPCandyTreeMoreRuleCell0" = "財富值達到%ld級可用，快去升級吧~"; ///XPCandyTreeViewController.m -"XPCandyTreeViewController0" = "%@鉆/次"; + "XPCandyTreeViewController2" = "購買愛心數量不能為0！"; "XPCandyTreeViewController4" = "去參與"; "XPCandyTreeViewController5" = "一次只能選擇99999次"; @@ -998,7 +998,7 @@ "XPUserCardPresenter20" = "拉入黑名單"; "XPUserCardPresenter21" = "主持位"; - +"XPUserCardPresenter22" = "@TA"; "XPUserCardViewController0" = "用戶不在房間內"; @@ -1328,7 +1328,7 @@ "XPRoomMessageContainerView6" = "底部有新消息"; "XPRoomMessageContainerView7" = "有人@你"; -"XPRoomMessageHeaderView0" = "平臺嚴禁未成年人直播或打賞，倡導綠色互動，禁止宣傳及發佈政治、低俗、暴力、色情等違規違法內容，嚴禁違規交易和誘導欺詐用戶，如有違規將對賬號進行封禁，發現請及時舉報"; +"XPRoomMessageHeaderView0" = "平臺倡導友善互動，禁止宣傳及發佈違規違法內容，嚴禁欺詐用戶，如有違規將進行帳號封禁，如有違規請及時舉報。"; "XPRoomMessageParser0" = "我:"; "XPRoomMessageParser1" = " 駕著 "; @@ -1454,7 +1454,7 @@ "XPRoomMessageParser120"="史詩"; "XPRoomMessageParser121"="初級"; "XPRoomMessageParser122"="召喚"; -"XPRoomMessageParser123"="鉆"; +"XPRoomMessageParser123"="金幣"; "XPRoomMessageParser124"="【去參加】"; "XPRoomMessageParser125"="在幸運塔羅中運氣爆發 獲得"; @@ -1620,7 +1620,7 @@ "XPRoomAnchorRankBannerView0" = "恭喜 %@ 成為上時段 小時榜TOP1"; "XPRoomAnchorRankBannerView1" = "小時榜TOP1"; -"XPRoomLuckyBigPrizeView0" = "%@運氣爆表！在%@ 中開出了價值 %@鉆 的 %@"; +"XPRoomLuckyBigPrizeView0" = "%@運氣爆表！在%@ 中開出了價值 %@金幣 的 %@"; @@ -1897,10 +1897,7 @@ "XPSessionListHeadFriendCell0" = "直播"; -"XPSessionListHeadView0" = "官方公告"; -"XPSessionListHeadView1" = "活動通知"; -"XPSessionListHeadView2" = "訂閱提醒"; -"XPSessionListHeadView3" = "發現萌新"; + "NIMTimeUtils1" = "昨天"; "NIMTimeUtils3" = "前天"; @@ -2182,7 +2179,7 @@ "XPLoginViewController3" = "同意《默認》，並授權%@獲取本機號碼"; "XPLoginViewController4" = "登錄成功"; "XPLoginViewController5" = "手機號碼登錄"; -"XPLoginViewController6" = "同意"; +"XPLoginViewController6" = "同意《用戶服務協議》和《隱私政策》"; "XPLoginViewController7" = "《用戶服務協議》"; "XPLoginViewController8" = "和"; "XPLoginViewController9" = "《隱私政策》"; @@ -2564,7 +2561,7 @@ "XPMineConfirmGiveDiamondView1"="向%@轉贈"; "XPMineConfirmGiveDiamondView2"="手續費"; "XPMineConfirmGiveDiamondView3"="總消耗金幣"; -"XPMineConfirmGiveDiamondView4"="鉆"; +"XPMineConfirmGiveDiamondView4"="金幣"; "XPMineConfirmGiveDiamondView5"="兌換鉆石獲得金幣"; "XPMineConfirmGiveDiamondView6"="%ld鉆石"; "XPMineConfirmGiveDiamondView7"="消耗鉆石"; @@ -2576,7 +2573,7 @@ "XPMineGiveDiamondDetailsVC2"="禮物"; ///XPMineGiveDiamondDetailsCell -"XPMineGiveDiamondDetailsCell0"="總支出%@鉆"; +"XPMineGiveDiamondDetailsCell0"="總支出%@金幣"; ///XPMineChooseGiveGiftView "XPMineChooseGiveGiftView0"="數量"; "XPMineChooseGiveGiftView1"="全部"; @@ -2626,7 +2623,7 @@ "XPExchangeDiamondsView5"="兌換成功"; "XPIncomeRecordGoldDetailsView0"="暫沒有數據"; -"XPIncomeRecordGoldDetailsView1"="當前房間總計金幣流水:%@鉆"; +"XPIncomeRecordGoldDetailsView1"="當前房間總計金幣流水:%@金幣"; "XPIncomeRecordGoldDetailsVC0"="鉆石明細"; "XPIncomeRecordGoldDetailsVC1"="至"; @@ -2770,13 +2767,13 @@ "XPTreasureFairySendRecordCell1"="你贈送%@一張「%@「精靈卡"; "XPTreasureFairySendRecordCell2"="%@贈送了你一張「%@「精靈卡"; ///XPTreasureFairyShopingExchangeCell -"XPTreasureFairyShopingExchangeCell0"="鉆"; +"XPTreasureFairyShopingExchangeCell0"="金幣"; "XPTreasureFairyShopingExchangeCell1"="兌換"; ///XPTreasureFairyShopingRecordCell "XPTreasureFairyShopingRecordCell0"="初級召喚"; "XPTreasureFairyShopingRecordCell1"="史詩召喚"; "XPTreasureFairyShopingRecordCell2"="傳說召喚"; -"XPTreasureFairyShopingRecordCell3"="%@鉆"; +"XPTreasureFairyShopingRecordCell3"="%@金幣"; ///XPTreasureFairyTrialsRecordCell "XPTreasureFairyTrialsRecordCell0"="傳說試煉"; "XPTreasureFairyTrialsRecordCell1"="精靈分解"; @@ -2786,7 +2783,7 @@ "XPTreasureFairyDrawView0"="還差 %@ 幸運值,額外獲贈傳說精靈"; "XPTreasureFairyDrawView1"="當前幸運值： %@"; ///XPTreasureFairyExchangeView -"XPTreasureFairyExchangeView0"="鉆"; +"XPTreasureFairyExchangeView0"="金幣"; "XPTreasureFairyExchangeView1"="提示"; "XPTreasureFairyExchangeView2"="兌換"; "XPTreasureFairyExchangeView3"="您將要兌換「%@(%@)」"; @@ -2855,7 +2852,7 @@ "XPTreasureFairyStoreView8"="一"; "XPTreasureFairyStoreView9"="十"; ///XPTreasureFairySummonGiftView -"XPTreasureFairySummonGiftView0"="%ld鉆"; +"XPTreasureFairySummonGiftView0"="%ld金幣"; ///XPTreasureFairySummonView "XPTreasureFairySummonView0"="恭喜獲得"; ///XPTreasureFairyTrialsContentView @@ -2901,7 +2898,7 @@ "XPTreasureFairyGiftView5"="史詩"; "XPTreasureFairyGiftView6"="傳說"; "XPTreasureFairyGiftView7"="召喚"; -"XPTreasureFairyGiftView8"="鉆"; +"XPTreasureFairyGiftView8"="金幣"; ///XPMineUserInfoRecordedSoundView "XPMineUserInfoRecordedSoundView0"="好的聲音能帶來更多關註哦~"; "XPMineUserInfoRecordedSoundView1"="點擊開始錄製"; @@ -3174,7 +3171,7 @@ ///PIRoomSendRedPacketItemVC "PIRoomSendRedPacketItemVC0"="紅包金額"; "PIRoomSendRedPacketItemVC1"="紅包數量"; -"PIRoomSendRedPacketItemVC2"="鉆"; +"PIRoomSendRedPacketItemVC2"="金幣"; "PIRoomSendRedPacketItemVC3"="個"; "PIRoomSendRedPacketItemVC4"="立即生效"; "PIRoomSendRedPacketItemVC5"="限時生效";