diff --git a/YuMi.xcodeproj/project.pbxproj b/YuMi.xcodeproj/project.pbxproj index 3fb45e7b..4282dfb1 100644 --- a/YuMi.xcodeproj/project.pbxproj +++ b/YuMi.xcodeproj/project.pbxproj @@ -216,6 +216,12 @@ 2368ECD32BC38FDA00EDF4C9 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2368ECD52BC38FDA00EDF4C9 /* Launch Screen.storyboard */; }; 2368ECDA2BC3C02800EDF4C9 /* XPMineSwitchLanguageVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 2368ECD92BC3C02800EDF4C9 /* XPMineSwitchLanguageVC.m */; }; 2368ECDF2BC51B2D00EDF4C9 /* XPMineSwitchLanguageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 2368ECDE2BC51B2D00EDF4C9 /* XPMineSwitchLanguageCell.m */; }; + 2368ECE72BC5280300EDF4C9 /* css in Resources */ = {isa = PBXBuildFile; fileRef = 2368ECE12BC5280300EDF4C9 /* css */; }; + 2368ECE82BC5280300EDF4C9 /* images in Resources */ = {isa = PBXBuildFile; fileRef = 2368ECE22BC5280300EDF4C9 /* images */; }; + 2368ECE92BC5280300EDF4C9 /* js in Resources */ = {isa = PBXBuildFile; fileRef = 2368ECE32BC5280300EDF4C9 /* js */; }; + 2368ECEA2BC5280300EDF4C9 /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = 2368ECE42BC5280300EDF4C9 /* index.html */; }; + 2368ECEB2BC5280300EDF4C9 /* upload.html in Resources */ = {isa = PBXBuildFile; fileRef = 2368ECE52BC5280300EDF4C9 /* upload.html */; }; + 2368ECEC2BC5280300EDF4C9 /* local in Resources */ = {isa = PBXBuildFile; fileRef = 2368ECE62BC5280300EDF4C9 /* local */; }; 2369F9912A89CE0E00563B48 /* PIUserSexView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2369F9902A89CE0E00563B48 /* PIUserSexView.m */; }; 2369F9932A8B21EB00563B48 /* pi_treasure_fairy_gift_bg.svga in Resources */ = {isa = PBXBuildFile; fileRef = 2369F9922A8B21EA00563B48 /* pi_treasure_fairy_gift_bg.svga */; }; 236B2E422AA07D06003967A8 /* SudCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 236B2E232AA07D06003967A8 /* SudCommon.m */; }; @@ -1110,11 +1116,6 @@ E86E79D628A4EA0C006DAF48 /* SessionRiskCache.m in Sources */ = {isa = PBXBuildFile; fileRef = E86E79D528A4EA0C006DAF48 /* SessionRiskCache.m */; }; E86F6185284F4E4800E8EC9A /* RoomHalfHourRankModel.m in Sources */ = {isa = PBXBuildFile; fileRef = E86F6184284F4E4800E8EC9A /* RoomHalfHourRankModel.m */; }; E872309326E8D31500B90D4F /* LoginVerifCodeView.m in Sources */ = {isa = PBXBuildFile; fileRef = E872309226E8D31500B90D4F /* LoginVerifCodeView.m */; }; - E8729EEC2A3B34D30076D80A /* index.html in Resources */ = {isa = PBXBuildFile; fileRef = E8729EE72A3B34D20076D80A /* index.html */; }; - E8729EED2A3B34D30076D80A /* upload.html in Resources */ = {isa = PBXBuildFile; fileRef = E8729EE82A3B34D20076D80A /* upload.html */; }; - E8729EEE2A3B34D30076D80A /* css in Resources */ = {isa = PBXBuildFile; fileRef = E8729EE92A3B34D30076D80A /* css */; }; - E8729EEF2A3B34D30076D80A /* images in Resources */ = {isa = PBXBuildFile; fileRef = E8729EEA2A3B34D30076D80A /* images */; }; - E8729EF02A3B34D30076D80A /* js in Resources */ = {isa = PBXBuildFile; fileRef = E8729EEB2A3B34D30076D80A /* js */; }; E873EB02280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E873EB01280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.m */; }; E873EB05280943ED0071030D /* XPMineUserInfoGiftWallPresenter.m in Sources */ = {isa = PBXBuildFile; fileRef = E873EB04280943ED0071030D /* XPMineUserInfoGiftWallPresenter.m */; }; E873EB09280960990071030D /* XPMineUserInfoVoiceCardView.m in Sources */ = {isa = PBXBuildFile; fileRef = E873EB08280960990071030D /* XPMineUserInfoVoiceCardView.m */; }; @@ -1917,6 +1918,12 @@ 2368ECD92BC3C02800EDF4C9 /* XPMineSwitchLanguageVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineSwitchLanguageVC.m; sourceTree = ""; }; 2368ECDD2BC51B2D00EDF4C9 /* XPMineSwitchLanguageCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineSwitchLanguageCell.h; sourceTree = ""; }; 2368ECDE2BC51B2D00EDF4C9 /* XPMineSwitchLanguageCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineSwitchLanguageCell.m; sourceTree = ""; }; + 2368ECE12BC5280300EDF4C9 /* css */ = {isa = PBXFileReference; lastKnownFileType = folder; path = css; sourceTree = ""; }; + 2368ECE22BC5280300EDF4C9 /* images */ = {isa = PBXFileReference; lastKnownFileType = folder; path = images; sourceTree = ""; }; + 2368ECE32BC5280300EDF4C9 /* js */ = {isa = PBXFileReference; lastKnownFileType = folder; path = js; sourceTree = ""; }; + 2368ECE42BC5280300EDF4C9 /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = ""; }; + 2368ECE52BC5280300EDF4C9 /* upload.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = upload.html; sourceTree = ""; }; + 2368ECE62BC5280300EDF4C9 /* local */ = {isa = PBXFileReference; lastKnownFileType = folder; path = local; sourceTree = ""; }; 2369F98F2A89CE0E00563B48 /* PIUserSexView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PIUserSexView.h; sourceTree = ""; }; 2369F9902A89CE0E00563B48 /* PIUserSexView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PIUserSexView.m; sourceTree = ""; }; 2369F9922A8B21EA00563B48 /* pi_treasure_fairy_gift_bg.svga */ = {isa = PBXFileReference; lastKnownFileType = file; path = pi_treasure_fairy_gift_bg.svga; sourceTree = ""; }; @@ -3555,11 +3562,6 @@ E872309226E8D31500B90D4F /* LoginVerifCodeView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginVerifCodeView.m; sourceTree = ""; }; E8729EB92A3B10C10076D80A /* YuMiRelease.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = YuMiRelease.entitlements; sourceTree = ""; }; E8729EBA2A3B10C10076D80A /* YuMi.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = YuMi.entitlements; sourceTree = ""; }; - E8729EE72A3B34D20076D80A /* index.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = index.html; sourceTree = ""; }; - E8729EE82A3B34D20076D80A /* upload.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = upload.html; sourceTree = ""; }; - E8729EE92A3B34D30076D80A /* css */ = {isa = PBXFileReference; lastKnownFileType = folder; path = css; sourceTree = ""; }; - E8729EEA2A3B34D30076D80A /* images */ = {isa = PBXFileReference; lastKnownFileType = folder; path = images; sourceTree = ""; }; - E8729EEB2A3B34D30076D80A /* js */ = {isa = PBXFileReference; lastKnownFileType = folder; path = js; sourceTree = ""; }; E873EB00280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoEmptyCollectionViewCell.h; sourceTree = ""; }; E873EB01280922720071030D /* XPMineUserInfoEmptyCollectionViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = XPMineUserInfoEmptyCollectionViewCell.m; sourceTree = ""; }; E873EB03280943ED0071030D /* XPMineUserInfoGiftWallPresenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = XPMineUserInfoGiftWallPresenter.h; sourceTree = ""; }; @@ -4380,11 +4382,12 @@ 1427216029A75F6F00C7C423 /* Web */ = { isa = PBXGroup; children = ( - E8729EE92A3B34D30076D80A /* css */, - E8729EEA2A3B34D30076D80A /* images */, - E8729EE72A3B34D20076D80A /* index.html */, - E8729EEB2A3B34D30076D80A /* js */, - E8729EE82A3B34D20076D80A /* upload.html */, + 2368ECE12BC5280300EDF4C9 /* css */, + 2368ECE22BC5280300EDF4C9 /* images */, + 2368ECE42BC5280300EDF4C9 /* index.html */, + 2368ECE32BC5280300EDF4C9 /* js */, + 2368ECE62BC5280300EDF4C9 /* local */, + 2368ECE52BC5280300EDF4C9 /* upload.html */, ); path = Web; sourceTree = ""; @@ -10614,7 +10617,6 @@ 23CEFC5A2AFB8FC100576D89 /* pay_on.png in Resources */, E80EC82828ACD84000D133C5 /* emoji_55@2x.png in Resources */, 2368ECD32BC38FDA00EDF4C9 /* Launch Screen.storyboard in Resources */, - E8729EEF2A3B34D30076D80A /* images in Resources */, E80EC86728ACD84000D133C5 /* emoji_11@2x.png in Resources */, E80EC88B28ACD84000D133C5 /* emoji_58@2x.png in Resources */, 23EE96F22B9FF6BE00475D69 /* pi_crazy_zoo.svga in Resources */, @@ -10673,9 +10675,10 @@ E80EC8A828ACD84100D133C5 /* emoji_76@2x.png in Resources */, 2368ECCF2BC38F9800EDF4C9 /* InfoPlist.strings in Resources */, E80EC88E28ACD84000D133C5 /* emoji_142@2x.png in Resources */, + 2368ECE72BC5280300EDF4C9 /* css in Resources */, E80EC83D28ACD84000D133C5 /* emoji_04@2x.png in Resources */, E80EC81728ACD84000D133C5 /* emoji_134@2x.png in Resources */, - E8729EF02A3B34D30076D80A /* js in Resources */, + 2368ECE92BC5280300EDF4C9 /* js in Resources */, E80EC88328ACD84000D133C5 /* emoji_70@2x.png in Resources */, 23CEFC532AFB8FC100576D89 /* readMe_FileOption.txt in Resources */, E80EC89528ACD84000D133C5 /* emoji_99@2x.png in Resources */, @@ -10693,6 +10696,7 @@ 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 */, E80EC86528ACD84000D133C5 /* emoji_03@2x.png in Resources */, @@ -10714,6 +10718,7 @@ E80EC84128ACD84000D133C5 /* emoji_16@2x.png in Resources */, E80EC83C28ACD84000D133C5 /* emoji_67@2x.png in Resources */, E80EC8B928ACD84100D133C5 /* emoji_164@2x.png in Resources */, + 2368ECEA2BC5280300EDF4C9 /* index.html in Resources */, E80EC87028ACD84000D133C5 /* emoji_81@2x.png in Resources */, E80EC8AA28ACD84100D133C5 /* emoji_15@2x.png in Resources */, E80EC85628ACD84000D133C5 /* emoji_106@2x.png in Resources */, @@ -10735,7 +10740,7 @@ E80EC89928ACD84000D133C5 /* emoji_21@2x.png in Resources */, 23FF25702ABD456C0064E904 /* pi_home_new_play.svga in Resources */, E80EC8BA28ACD84100D133C5 /* emoji.plist in Resources */, - E8729EEC2A3B34D30076D80A /* index.html in Resources */, + 2368ECE82BC5280300EDF4C9 /* images in Resources */, E80EC82328ACD84000D133C5 /* emoji_57@2x.png in Resources */, 2369F9932A8B21EB00563B48 /* pi_treasure_fairy_gift_bg.svga in Resources */, E80EC87E28ACD84000D133C5 /* emoji_129@2x.png in Resources */, @@ -10767,12 +10772,10 @@ E80EC81628ACD84000D133C5 /* emoji_126@2x.png in Resources */, E80EC8A328ACD84100D133C5 /* emoji_52@2x.png in Resources */, E80EC84E28ACD84000D133C5 /* emoji_132@2x.png in Resources */, - E8729EED2A3B34D30076D80A /* upload.html in Resources */, 23CEFC562AFB8FC100576D89 /* pay_off.png in Resources */, E80EC82928ACD84000D133C5 /* emoji_28@2x.png in Resources */, E80EC82028ACD84000D133C5 /* emoji_38@2x.png in Resources */, 23E9EB332A85E97C00B792F2 /* pi_login_new_logo.png in Resources */, - E8729EEE2A3B34D30076D80A /* css in Resources */, E80EC8A628ACD84100D133C5 /* emoji_23@2x.png in Resources */, E80EC84328ACD84000D133C5 /* emoji_20@2x.png in Resources */, E80EC88528ACD84000D133C5 /* emoji_62@2x.png in Resources */, @@ -10787,6 +10790,7 @@ E80EC84C28ACD84000D133C5 /* emoji_120@2x.png in Resources */, 23E9EAA32A84C80300B792F2 /* pi_new_loading.svga in Resources */, E80EC83628ACD84000D133C5 /* emoji_147@2x.png in Resources */, + 2368ECEC2BC5280300EDF4C9 /* local in Resources */, 23E9EB242A84E98300B792F2 /* pi_new_mine_info_sound_play.svga in Resources */, 23CEFC552AFB8FC100576D89 /* pay_off@3x.png in Resources */, E80EC86B28ACD84000D133C5 /* emoji_200@2x.png in Resources */, diff --git a/YuMi/Assets.xcassets/yna/UserCard/user_card_clean_gift_value.imageset/Contents.json b/YuMi/Assets.xcassets/yna/UserCard/user_card_clean_gift_value.imageset/Contents.json new file mode 100644 index 00000000..4a0250c5 --- /dev/null +++ b/YuMi/Assets.xcassets/yna/UserCard/user_card_clean_gift_value.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "user_card_clean_gift_value.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/yna/UserCard/user_card_clean_gift_value.imageset/user_card_clean_gift_value.png b/YuMi/Assets.xcassets/yna/UserCard/user_card_clean_gift_value.imageset/user_card_clean_gift_value.png new file mode 100644 index 00000000..b57b3300 Binary files /dev/null and b/YuMi/Assets.xcassets/yna/UserCard/user_card_clean_gift_value.imageset/user_card_clean_gift_value.png differ diff --git a/YuMi/Assets.xcassets/yna/UserCard/user_card_close_mic.imageset/Contents.json b/YuMi/Assets.xcassets/yna/UserCard/user_card_close_mic.imageset/Contents.json new file mode 100644 index 00000000..612e69c8 --- /dev/null +++ b/YuMi/Assets.xcassets/yna/UserCard/user_card_close_mic.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "user_card_close_mic.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/yna/UserCard/user_card_close_mic.imageset/user_card_close_mic.png b/YuMi/Assets.xcassets/yna/UserCard/user_card_close_mic.imageset/user_card_close_mic.png new file mode 100644 index 00000000..833b1110 Binary files /dev/null and b/YuMi/Assets.xcassets/yna/UserCard/user_card_close_mic.imageset/user_card_close_mic.png differ diff --git a/YuMi/Assets.xcassets/yna/UserCard/user_card_down_mic_listen.imageset/Contents.json b/YuMi/Assets.xcassets/yna/UserCard/user_card_down_mic_listen.imageset/Contents.json new file mode 100644 index 00000000..11fe6273 --- /dev/null +++ b/YuMi/Assets.xcassets/yna/UserCard/user_card_down_mic_listen.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "user_card_down_mic_listen.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/yna/UserCard/user_card_down_mic_listen.imageset/user_card_down_mic_listen.png b/YuMi/Assets.xcassets/yna/UserCard/user_card_down_mic_listen.imageset/user_card_down_mic_listen.png new file mode 100644 index 00000000..ef7a2ef5 Binary files /dev/null and b/YuMi/Assets.xcassets/yna/UserCard/user_card_down_mic_listen.imageset/user_card_down_mic_listen.png differ diff --git a/YuMi/Assets.xcassets/yna/UserCard/user_card_lock_mic.imageset/Contents.json b/YuMi/Assets.xcassets/yna/UserCard/user_card_lock_mic.imageset/Contents.json new file mode 100644 index 00000000..c30d2fb2 --- /dev/null +++ b/YuMi/Assets.xcassets/yna/UserCard/user_card_lock_mic.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "user_card_lock_mic.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/yna/UserCard/user_card_lock_mic.imageset/user_card_lock_mic.png b/YuMi/Assets.xcassets/yna/UserCard/user_card_lock_mic.imageset/user_card_lock_mic.png new file mode 100644 index 00000000..44fdc68d Binary files /dev/null and b/YuMi/Assets.xcassets/yna/UserCard/user_card_lock_mic.imageset/user_card_lock_mic.png differ diff --git a/YuMi/Assets.xcassets/yna/UserCard/user_card_no_lock_mic.imageset/Contents.json b/YuMi/Assets.xcassets/yna/UserCard/user_card_no_lock_mic.imageset/Contents.json new file mode 100644 index 00000000..e336b512 --- /dev/null +++ b/YuMi/Assets.xcassets/yna/UserCard/user_card_no_lock_mic.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "user_card_no_lock_mic.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/yna/UserCard/user_card_no_lock_mic.imageset/user_card_no_lock_mic.png b/YuMi/Assets.xcassets/yna/UserCard/user_card_no_lock_mic.imageset/user_card_no_lock_mic.png new file mode 100644 index 00000000..4963360b Binary files /dev/null and b/YuMi/Assets.xcassets/yna/UserCard/user_card_no_lock_mic.imageset/user_card_no_lock_mic.png differ diff --git a/YuMi/Assets.xcassets/yna/UserCard/user_card_open_mic.imageset/Contents.json b/YuMi/Assets.xcassets/yna/UserCard/user_card_open_mic.imageset/Contents.json new file mode 100644 index 00000000..23d8051d --- /dev/null +++ b/YuMi/Assets.xcassets/yna/UserCard/user_card_open_mic.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "user_card_open_mic.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/YuMi/Assets.xcassets/yna/UserCard/user_card_open_mic.imageset/user_card_open_mic.png b/YuMi/Assets.xcassets/yna/UserCard/user_card_open_mic.imageset/user_card_open_mic.png new file mode 100644 index 00000000..69cef426 Binary files /dev/null and b/YuMi/Assets.xcassets/yna/UserCard/user_card_open_mic.imageset/user_card_open_mic.png differ diff --git a/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m b/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m index 5616ccd7..1ec09c0d 100644 --- a/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m +++ b/YuMi/Modules/YMLogin/View/LoginFullInfoViewController.m @@ -151,7 +151,7 @@ [self.remindLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.left.right.equalTo(self.bgView).inset(kGetScaleWidth(10)); make.top.mas_equalTo(kGetScaleWidth(48)); - make.height.mas_equalTo(kGetScaleWidth(22)); + }]; @@ -347,6 +347,7 @@ NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@（%@）",YMLocalizedString(@"LoginFullInfoViewController8"),YMLocalizedString(@"LoginFullInfoViewController2")] attributes:@{NSFontAttributeName:kFontMedium(16),NSForegroundColorAttributeName:UIColorFromRGB(0x1F1B4F)}]; [textAtt addAttributes:@{NSFontAttributeName:kFontRegular(12),NSForegroundColorAttributeName:UIColorFromRGB(0x6D6B89)} range:[textAtt.string rangeOfString:[NSString stringWithFormat:@"（%@）",YMLocalizedString(@"LoginFullInfoViewController2")]]]; _remindLabel.attributedText = textAtt; + _remindLabel.numberOfLines = 2; _remindLabel.textAlignment = NSTextAlignmentCenter; } return _remindLabel; diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m index 6e514eef..b445b58d 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginInputView.m @@ -86,7 +86,9 @@ UIButton *smsCodeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; [smsCodeBtn setTitle:YMLocalizedString(@"XPLoginInputView0") forState:UIControlStateNormal]; [smsCodeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - smsCodeBtn.titleLabel.font = kFontMedium(14); + smsCodeBtn.titleLabel.font = kFontMedium(12); + smsCodeBtn.titleLabel.textAlignment = NSTextAlignmentCenter; + smsCodeBtn.titleLabel.numberOfLines = 2; smsCodeBtn.layer.cornerRadius = kGetScaleWidth(38)/2; smsCodeBtn.layer.masksToBounds = YES; smsCodeBtn.backgroundColor = UIColorFromRGB(0x9168FA); diff --git a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m index c215704d..4825b889 100644 --- a/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m +++ b/YuMi/Modules/YMLogin/View/NewLogin/XPLoginViewController.m @@ -37,6 +37,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; @property(nonatomic,strong) UIImageView *logoView; /// 一键登录 @property (nonatomic, strong) UIButton *quickLoginBtn; +@property(nonatomic,strong) UIImageView *quickArrowView; /// 同意按钮 @property (nonatomic, strong) UIButton *agreeBtn; /// 协议隐私政策 @@ -97,6 +98,7 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; [self.view addSubview:self.logoView]; [self.view addSubview:self.stackView]; [self.view addSubview:self.quickLoginBtn]; + [self.view addSubview:self.quickArrowView]; [self.view addSubview:self.protocolLabel]; [self.view addSubview:self.agreeBtn]; @@ -142,13 +144,17 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; }]; - + [self.quickLoginBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.equalTo(self.view); make.height.mas_equalTo(kGetScaleWidth(22)); - make.width.mas_equalTo(kGetScaleWidth(140)); make.top.equalTo(self.stackView.mas_bottom).mas_offset(kGetScaleWidth(18)); }]; + [self.quickArrowView mas_makeConstraints:^(MASConstraintMaker *make) { + make.leading.equalTo(self.quickLoginBtn.mas_trailing).mas_offset(kGetScaleWidth(2)); + make.centerY.equalTo(self.quickLoginBtn); + make.width.height.mas_equalTo(kGetScaleWidth(10)); + }]; [self.protocolLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerX.mas_equalTo(self.view).offset(10); make.right.mas_lessThanOrEqualTo(-10); @@ -333,14 +339,17 @@ NSString * const HadAgreePrivacy = @"HadAgreePrivacy"; [_quickLoginBtn setTitle:YMLocalizedString(@"XPLoginViewController16") forState:UIControlStateNormal]; _quickLoginBtn.titleLabel.font = kFontRegular(14); [_quickLoginBtn setTitleColor:UIColorFromRGB(0x1F1B4F) forState:UIControlStateNormal]; - - [_quickLoginBtn setImage:[UIImage imageNamed:@"login_phone_white"] forState:UIControlStateNormal]; - [_quickLoginBtn setImageEdgeInsets:UIEdgeInsetsMake(0, kGetScaleWidth(130), 0, 0)]; [_quickLoginBtn addTarget:self action:@selector(quickLoginBtnClicked) forControlEvents:UIControlEventTouchUpInside]; } return _quickLoginBtn; } - +- (UIImageView *)quickArrowView{ + if(!_quickArrowView){ + _quickArrowView = [UIImageView new]; + _quickArrowView.image = kImage(@"login_phone_white"); + } + return _quickArrowView; +} - (UIButton *)agreeBtn { if(!_agreeBtn) { _agreeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; diff --git a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.m b/YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.m index c6f0aea0..c66625a5 100644 --- a/YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.m +++ b/YuMi/Modules/YMMine/Presenter/XPMineUserInfoEditPresenter.m @@ -61,8 +61,8 @@ [self.editArray addObject:self.birthItem]; [self.editArray addObject:self.photoItem]; [self.editArray addObject:self.areaItem]; - [self.editArray addObject:self.tagItem]; - [self.editArray addObject:self.soundItem]; +// [self.editArray addObject:self.tagItem]; +// [self.editArray addObject:self.soundItem]; [self.editArray addObject:self.desItem]; } diff --git a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m index a7752fa4..7a82a112 100644 --- a/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/Friend/XPMineFansTableViewCell.m @@ -281,9 +281,11 @@ _attentionButton = [UIButton buttonWithType:UIButtonTypeCustom]; [_attentionButton setTitle:YMLocalizedString(@"XPMineFansTableViewCell1") forState:UIControlStateNormal]; [_attentionButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _attentionButton.titleLabel.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium]; + _attentionButton.titleLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightMedium]; [_attentionButton setBackgroundImage:[UIImage gradientColorImageFromColors:@[[DJDKMIMOMColor confirmButtonGradientStartColor],[DJDKMIMOMColor confirmButtonGradientMiddleColor],[DJDKMIMOMColor confirmButtonGradientEndColor]] gradientType:GradientTypeLeftToRight imgSize:CGSizeMake((68), (30))] forState:UIControlStateNormal]; [_attentionButton setTitle:YMLocalizedString(@"XPMineFansTableViewCell2") forState:UIControlStateDisabled]; + _attentionButton.titleLabel.numberOfLines = 2; + _attentionButton.titleLabel.textAlignment = NSTextAlignmentCenter; [_attentionButton setBackgroundImage:[UIImage imageWithColor:[DJDKMIMOMColor disableButtonColor]] forState:UIControlStateDisabled]; _attentionButton.layer.masksToBounds = YES; _attentionButton.layer.cornerRadius = 15; diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m index b40548b4..e61210d0 100644 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineDataClanTableViewCell.m @@ -22,9 +22,9 @@ @property (nonatomic,strong) UILabel *titleLabel; ///星座 -@property (nonatomic,strong) UILabel *starView; -///星座背景图片 -@property (nonatomic,strong) UIImageView *starIconView; +//@property (nonatomic,strong) UILabel *starView; +/////星座背景图片 +//@property (nonatomic,strong) UIImageView *starIconView; ///生日 @property (nonatomic,strong) UILabel *birthdayHeadView; @property (nonatomic,strong) UILabel *birthdayView; @@ -63,8 +63,8 @@ self.selectionStyle = UITableViewCellSelectionStyleNone; [self.contentView addSubview:self.backView]; [self.backView addSubview:self.titleLabel]; - [self.backView addSubview:self.starView]; - [self.backView addSubview:self.starIconView]; +// [self.backView addSubview:self.starView]; +// [self.backView addSubview:self.starIconView]; [self.backView addSubview:self.birthdayHeadView]; [self.backView addSubview:self.birthdayView]; [self.backView addSubview:self.areaHeadView]; @@ -94,35 +94,35 @@ make.height.mas_equalTo(kGetScaleWidth(17)); }]; - [self.starView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.height.equalTo(self.titleLabel); - make.top.equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(12)); - - }]; - [self.starIconView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(18); - make.width.mas_equalTo(46); - make.centerY.equalTo(self.starView); - make.left.equalTo(self.starView.mas_right).mas_offset(kGetScaleWidth(10)); - }]; +// [self.starView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.left.height.equalTo(self.titleLabel); +// make.top.equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(12)); +// +// }]; +// [self.starIconView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.height.mas_equalTo(18); +// make.width.mas_equalTo(46); +// make.centerY.equalTo(self.starView); +// make.left.equalTo(self.starView.mas_right).mas_offset(kGetScaleWidth(10)); +// }]; [self.birthdayHeadView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.height.equalTo(self.titleLabel); - make.top.equalTo(self.starView.mas_bottom).mas_offset(kGetScaleWidth(5)); + make.top.equalTo(self.titleLabel.mas_bottom).mas_offset(kGetScaleWidth(12)); }]; [self.birthdayView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.birthdayHeadView); - make.left.equalTo(self.starIconView); + make.left.equalTo(self.birthdayHeadView.mas_right).mas_offset(kGetScaleWidth(10)); }]; [self.areaHeadView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.height.equalTo(self.titleLabel); - make.top.mas_equalTo(kGetScaleWidth(84)); + make.top.mas_equalTo(kGetScaleWidth(62)); }]; [self.areaView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.centerY.equalTo(self.areaHeadView); - make.left.equalTo(self.starIconView); + make.left.equalTo(self.birthdayView); }]; [self.areaMornBnt mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(kGetScaleWidth(25)); @@ -141,11 +141,11 @@ [self.roomHeadView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.height.equalTo(self.titleLabel); - make.top.mas_equalTo(kGetScaleWidth(106)); + make.top.mas_equalTo(kGetScaleWidth(84)); }]; [self.roomView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.centerY.equalTo(self.roomHeadView); - make.left.equalTo(self.starIconView); + make.left.equalTo(self.birthdayView); }]; [self.roomIconView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(20)); @@ -154,11 +154,11 @@ }]; [self.clanHeadView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.height.equalTo(self.titleLabel); - make.top.mas_equalTo(kGetScaleWidth(130)); + make.top.mas_equalTo(kGetScaleWidth(108)); }]; [self.clanView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.clanHeadView); - make.left.equalTo(self.starIconView); + make.left.equalTo(self.birthdayView); }]; [self.clanIconView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(kGetScaleWidth(20)); @@ -237,11 +237,11 @@ } -(void)setUserInfo:(UserInfoModel *)userInfo{ _userInfo = userInfo; - _starIconView.hidden = NO; +// _starIconView.hidden = NO; NSString *dateStr = [NSString stringWithFormat:@"%@",[NSString getCalculateConstellationImageWithMonth:_userInfo.birth]]; - if(dateStr.length > 0){ - _starIconView.image = kImage(dateStr); - } +// if(dateStr.length > 0){ +// _starIconView.image = kImage(dateStr); +// } _birthdayView.text = [NSDate timestampSwitchTime:_userInfo.birth / 1000 andFormatter:@"yyyy-MM-dd"]; _areaView.text = _userInfo.region; } @@ -316,19 +316,19 @@ return _titleLabel; } --(UILabel *)starView{ - if (!_starView){ - _starView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineDataClanTableViewCell7") font:kFontRegular(12) textColor:[DJDKMIMOMColor inputTextColor]]; - } - return _starView; -} --(UIImageView *)starIconView{ - if (!_starIconView){ - _starIconView = [[UIImageView alloc]init]; - _starIconView.hidden = YES; - } - return _starIconView; -} +//-(UILabel *)starView{ +// if (!_starView){ +// _starView = [UILabel labelInitWithText:YMLocalizedString(@"XPMineDataClanTableViewCell7") font:kFontRegular(12) textColor:[DJDKMIMOMColor inputTextColor]]; +// } +// return _starView; +//} +//-(UIImageView *)starIconView{ +// if (!_starIconView){ +// _starIconView = [[UIImageView alloc]init]; +// _starIconView.hidden = YES; +// } +// return _starIconView; +//} - (UILabel *)birthdayHeadView{ if (!_birthdayHeadView){ diff --git a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.m index c816af34..7264b6ec 100644 --- a/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/MineInfo/XPMineUserInfoEditTableViewCell.m @@ -113,7 +113,7 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(kGetScaleWidth(58)); + make.width.mas_equalTo(kGetScaleWidth(65)); }]; [self.subTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.right.equalTo(self.arrowImageView.mas_left).mas_offset(-kGetScaleWidth(2)); diff --git a/YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.m b/YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.m index fabd60e4..b8c02b9a 100644 --- a/YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Cell/XPMineNotificationTableViewCell.m @@ -52,7 +52,8 @@ make.top.mas_equalTo(14); }]; [self.subtitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.titleLabel); + make.leading.mas_equalTo(self.contentView).inset(15); + make.trailing.mas_equalTo(self.contentView).inset(65); make.top.mas_equalTo(self.titleLabel.mas_bottom).offset(8); }]; [self.selectSwitch mas_makeConstraints:^(MASConstraintMaker *make) { @@ -84,6 +85,7 @@ _subtitleLabel = [[UILabel alloc] init]; _subtitleLabel.font = [UIFont systemFontOfSize:12]; _subtitleLabel.textColor = [DJDKMIMOMColor secondTextColor]; + _subtitleLabel.numberOfLines = 2; } return _subtitleLabel; } diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.m index 45419080..bf4683cd 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCardTableViewCell.m @@ -120,11 +120,19 @@ }]; [self.limitTimeBgView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.right.mas_equalTo(self.userCardBackView); - make.size.mas_equalTo(CGSizeMake(36, 20)); + make.height.mas_equalTo(20); + make.width.mas_greaterThanOrEqualTo(36); }]; [self.limitLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.limitTimeBgView); + make.leading.trailing.equalTo(self.limitTimeBgView).inset(5); + make.top.bottom.equalTo(self.limitTimeBgView); }]; + [self.limitTimeBgView.superview layoutIfNeeded]; + CAShapeLayer * layer = [CAShapeLayer layer]; + UIBezierPath * path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, self.limitTimeBgView.frame.size.width, 20) byRoundingCorners:UIRectCornerBottomLeft cornerRadii:CGSizeMake(10, 10)]; + layer.path = path.CGPath; + _limitTimeBgView.layer.masksToBounds = YES; + _limitTimeBgView.layer.mask = layer; } #pragma mark - private @@ -245,11 +253,7 @@ if (!_limitTimeBgView) { _limitTimeBgView = [[UIView alloc] init]; _limitTimeBgView.backgroundColor = UIColorFromRGB(0xFB486A); - CAShapeLayer * layer = [CAShapeLayer layer]; - UIBezierPath * path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, 36, 20) byRoundingCorners:UIRectCornerBottomLeft cornerRadii:CGSizeMake(10, 10)]; - layer.path = path.CGPath; - _limitTimeBgView.layer.masksToBounds = YES; - _limitTimeBgView.layer.mask = layer; + } return _limitTimeBgView; diff --git a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.m b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.m index 2880ed31..9147231c 100644 --- a/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.m +++ b/YuMi/Modules/YMMine/View/DressUp/View/Cell/XPDressUpShopCollectionViewCell.m @@ -109,11 +109,20 @@ }]; [self.limitTimeBgView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.right.mas_equalTo(self.userCardBackView); - make.size.mas_equalTo(CGSizeMake(36, 20)); + make.height.mas_equalTo(20); + make.width.mas_greaterThanOrEqualTo(36); }]; [self.limitLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.edges.mas_equalTo(self.limitTimeBgView); + make.leading.trailing.equalTo(self.limitTimeBgView).inset(5); + make.top.bottom.equalTo(self.limitTimeBgView); }]; + [self.limitTimeBgView.superview layoutIfNeeded]; + CAShapeLayer * layer = [CAShapeLayer layer]; + UIBezierPath * path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, self.limitTimeBgView.frame.size.width, 20) byRoundingCorners:UIRectCornerBottomLeft cornerRadii:CGSizeMake(10, 10)]; + layer.path = path.CGPath; + _limitTimeBgView.layer.masksToBounds = YES; + _limitTimeBgView.layer.mask = layer; + } #pragma mark - private @@ -225,12 +234,6 @@ if (!_limitTimeBgView) { _limitTimeBgView = [[UIView alloc] init]; _limitTimeBgView.backgroundColor = UIColorFromRGB(0xFB486A); - CAShapeLayer * layer = [CAShapeLayer layer]; - UIBezierPath * path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, 36, 20) byRoundingCorners:UIRectCornerBottomLeft cornerRadii:CGSizeMake(10, 10)]; - layer.path = path.CGPath; - _limitTimeBgView.layer.masksToBounds = YES; - _limitTimeBgView.layer.mask = layer; - } return _limitTimeBgView; } diff --git a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.m b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.m index 0af1d856..f6fcb0c1 100644 --- a/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.m +++ b/YuMi/Modules/YMMine/View/Guild/View/Cell/XPClanMemberTableViewCell.m @@ -237,7 +237,7 @@ avatarBoderColor = UIColorFromRGB(0x7727E4); roleGradStartColor = UIColorFromRGB(0x5092FE); roleGradEndColor = UIColorFromRGB(0x6A10B5); - roleWidth = 58; + roleWidth = 66; break; default: diff --git a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m index 11261c77..18807ccb 100644 --- a/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m +++ b/YuMi/Modules/YMMine/View/IncomeRecord/XPIncomeRecordView.m @@ -155,7 +155,8 @@ [_detailView setTitle:YMLocalizedString(@"XPIncomeRecordView0") forState:UIControlStateNormal]; [_detailView setTitleColor:self.type == IncomeRecord_Diamond ? UIColorFromRGB(0x1B1558):UIColorFromRGB(0x582815) forState:UIControlStateNormal]; _detailView.titleLabel.font = [UIFont systemFontOfSize:13]; - _detailView.imageEdgeInsets = UIEdgeInsetsMake(0, kGetScaleWidth(40), 0, 0); + CGFloat width = [[NSBundle getLanguageText]hasPrefix:@"zh"] ? 40 : 50; + _detailView.imageEdgeInsets = UIEdgeInsetsMake(0, kGetScaleWidth(width), 0, 0); _detailView.titleEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0); [_detailView setImage:self.type == IncomeRecord_Diamond ? [UIImage imageNamed:@"income_record_arrow_1"]: [UIImage imageNamed:@"income_record_arrow_2"] forState:UIControlStateNormal]; [_detailView addTarget:self action:@selector(clickDetailViewAction) forControlEvents:UIControlEventTouchUpInside]; diff --git a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m index 21ae3b7f..43a7da72 100644 --- a/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m +++ b/YuMi/Modules/YMMine/View/MineInfo/XPMineUserDataViewController.m @@ -106,11 +106,11 @@ if(indexPath.section == 0){ if(self.isOpne == YES){ if (self.clanDetailInfo.clan.elderUid.length > 0) { - return kGetScaleWidth(172); + return kGetScaleWidth(150); } - return kGetScaleWidth(152); + return kGetScaleWidth(130); } - return kGetScaleWidth(128); + return kGetScaleWidth(106); } if (self.datasource.count > 0) { MonentsInfoModel * monentInfo= [self.datasource safeObjectAtIndex1:indexPath.row]; diff --git a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.m b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.m index 6878b048..2cb6f301 100644 --- a/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.m +++ b/YuMi/Modules/YMMine/View/Noble/View/SubViews/PINobleCenterListView.m @@ -48,7 +48,7 @@ [self.fooderView mas_makeConstraints:^(MASConstraintMaker *make) { make.leading.trailing.equalTo(self).inset(10); make.top.equalTo(self.pi_collectionView.mas_bottom).mas_offset(12); - make.height.mas_equalTo(68); + make.height.mas_equalTo(90); }]; } - (void)setVipInfo:(NobleInfo *)vipInfo{ diff --git a/YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.m b/YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.m index a72dd09f..a7d36885 100644 --- a/YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.m +++ b/YuMi/Modules/YMMine/View/Setting/XPMineNotificaViewController.m @@ -92,7 +92,7 @@ } - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { - return 70; + return 80; } diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m index e6731b53..2ad84fd2 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoDateView.m @@ -27,7 +27,7 @@ ///年龄 @property(nonatomic,strong) UILabel *ageView; ///星座 -@property(nonatomic,strong) UILabel *starView; +//@property(nonatomic,strong) UILabel *starView; @property(nonatomic,strong) NSMutableArray *dataSourceArray; @end @@ -48,7 +48,7 @@ [self addSubview:self.cancleButton]; [self addSubview:self.bgView]; [self.bgView addSubview:self.ageView]; - [self.bgView addSubview:self.starView]; +// [self.bgView addSubview:self.starView]; [self.bgView addSubview:self.sureButton]; [self.bgView addSubview:self.pickerView]; } @@ -66,14 +66,15 @@ make.top.mas_equalTo(kGetScaleWidth(16)); make.width.mas_equalTo(kGetScaleWidth(98)); make.height.mas_equalTo(kGetScaleWidth(36)); - make.leading.mas_equalTo(kGetScaleWidth(80)); - }]; - [self.starView mas_makeConstraints:^(MASConstraintMaker *make) { - make.trailing.mas_equalTo(-kGetScaleWidth(80)); - make.top.mas_equalTo(kGetScaleWidth(16)); - make.width.mas_equalTo(kGetScaleWidth(98)); - make.height.mas_equalTo(kGetScaleWidth(36)); +// make.leading.mas_equalTo(kGetScaleWidth(80)); + make.centerX.equalTo(self); }]; +// [self.starView mas_makeConstraints:^(MASConstraintMaker *make) { +// make.trailing.mas_equalTo(-kGetScaleWidth(80)); +// make.top.mas_equalTo(kGetScaleWidth(16)); +// make.width.mas_equalTo(kGetScaleWidth(98)); +// make.height.mas_equalTo(kGetScaleWidth(36)); +// }]; [self.sureButton mas_makeConstraints:^(MASConstraintMaker *make) { make.bottom.mas_equalTo(-kGetScaleWidth(42)); make.centerX.equalTo(self.bgView); @@ -83,7 +84,7 @@ [self.pickerView mas_makeConstraints:^(MASConstraintMaker *make) { make.left.right.mas_equalTo(self); make.bottom.equalTo(self.sureButton.mas_top); - make.top.equalTo(self.starView.mas_bottom).mas_offset(kGetScaleWidth(10)); + make.top.equalTo(self.ageView.mas_bottom).mas_offset(kGetScaleWidth(10)); }]; } @@ -183,7 +184,7 @@ NSDate *date = [NSDate at_dateFromString:time]; NSTimeInterval interval = [date timeIntervalSince1970] * 1000; self.ageView.text = [NSString stringWithFormat:@"%ld%@",[PLTimeUtil ageWithDateFromBirth:interval],YMLocalizedString(@"XPMineUserInfoDateView3")]; - self.starView.text = [NSString stringWithFormat:@"%@%@",[NSString getCalculateConstellationTextWithMonth:interval],YMLocalizedString(@"XPMineUserInfoDateView4")] ; +// self.starView.text = [NSString stringWithFormat:@"%@%@",[NSString getCalculateConstellationTextWithMonth:interval],YMLocalizedString(@"XPMineUserInfoDateView4")] ; } //数据源 -(NSMutableArray *)dataSourceArray{ @@ -291,7 +292,7 @@ } self.ageView.text = [NSString stringWithFormat:@"%ld%@",[PLTimeUtil ageWithDateFromBirth:time*1000],YMLocalizedString(@"XPMineUserInfoDateView3")]; - self.starView.text = [NSString stringWithFormat:@"%@%@",[NSString getCalculateConstellationTextWithMonth:time*1000],YMLocalizedString(@"XPMineUserInfoDateView4")] ; +// self.starView.text = [NSString stringWithFormat:@"%@%@",[NSString getCalculateConstellationTextWithMonth:time*1000],YMLocalizedString(@"XPMineUserInfoDateView4")] ; } - (UIButton *)cancleButton { if (!_cancleButton) { @@ -350,15 +351,15 @@ } return _ageView; } -- (UILabel *)starView{ - if(!_starView){ - _starView = [UILabel labelInitWithText:@"" font:kFontMedium(16) textColor:UIColorFromRGB(0x1E1E1F)]; - [_starView setCornerWithLeftTopCorner:kGetScaleWidth(7) rightTopCorner:kGetScaleWidth(7) bottomLeftCorner:kGetScaleWidth(7) bottomRightCorner:kGetScaleWidth(7) size:CGSizeMake(kGetScaleWidth(98), kGetScaleWidth(36))]; - _starView.backgroundColor = UIColorFromRGB(0xF7F7F7); - _starView.textAlignment = NSTextAlignmentCenter; - } - return _starView; -} +//- (UILabel *)starView{ +// if(!_starView){ +// _starView = [UILabel labelInitWithText:@"" font:kFontMedium(16) textColor:UIColorFromRGB(0x1E1E1F)]; +// [_starView setCornerWithLeftTopCorner:kGetScaleWidth(7) rightTopCorner:kGetScaleWidth(7) bottomLeftCorner:kGetScaleWidth(7) bottomRightCorner:kGetScaleWidth(7) size:CGSizeMake(kGetScaleWidth(98), kGetScaleWidth(36))]; +// _starView.backgroundColor = UIColorFromRGB(0xF7F7F7); +// _starView.textAlignment = NSTextAlignmentCenter; +// } +// return _starView; +//} - (NSDateComponents *)components{ if(!_components){ NSCalendar * calender = [NSCalendar currentCalendar]; diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m index ab891085..d2452eaf 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoEditPickView.m @@ -110,7 +110,6 @@ [self.cancelBtn mas_makeConstraints:^(MASConstraintMaker *make) { make.left.mas_equalTo(kGetScaleWidth(15)); make.top.mas_equalTo(kGetScaleWidth(20)); - make.width.mas_equalTo(kGetScaleWidth(35)); make.height.mas_equalTo(kGetScaleWidth(20)); }]; diff --git a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m index eccbb8fa..16725da3 100644 --- a/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m +++ b/YuMi/Modules/YMMine/View/SubViews/MineInfo/XPMineUserInfoHeaderView.m @@ -534,7 +534,7 @@ _soundModel = soundModel; if(_soundModel != nil){ if(_soundModel.status == 2){ - _soundView.hidden = NO; + _soundView.hidden = YES; _soundTimeView.hidden = NO; _soundSVGAView.hidden = NO; _soundPromptView.hidden = YES; @@ -542,8 +542,8 @@ return; } if(_soundModel.uid.integerValue == [[AccountInfoStorage instance] getUid].integerValue){ - _soundView.hidden = NO; - _soundPromptView.hidden = NO; + _soundView.hidden = YES; + _soundPromptView.hidden = YES; _soundTimeView.hidden = YES; _soundSVGAView.hidden = YES; } @@ -552,8 +552,8 @@ } if(_soundModel.uid.integerValue == [[AccountInfoStorage instance] getUid].integerValue){ - _soundView.hidden = NO; - _soundPromptView.hidden = NO; + _soundView.hidden = YES; + _soundPromptView.hidden = YES; _soundTimeView.hidden = YES; _soundSVGAView.hidden = YES; return; @@ -695,9 +695,10 @@ NSString *uid = [[AccountInfoStorage instance]getUid]; BOOL isMe = self.userInfo.uid == uid.integerValue; if(isMe == YES){ - _tagView.hidden = NO; + _tagView.hidden = YES; }else{ - _tagView.hidden = !(itemList.count > 0); +// _tagView.hidden = !(itemList.count > 0); + _tagView.hidden = YES; } _tagView.uid = @(self.userInfo.uid).stringValue; _tagView.itemList = itemList; diff --git a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m index 82fd5b57..f6edb779 100644 --- a/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m +++ b/YuMi/Modules/YMMine/View/SubViews/XPMineHeadView.m @@ -579,6 +579,7 @@ - (UIImageView *)starVeiw{ if(!_starVeiw){ _starVeiw = [UIImageView new]; + _starVeiw.hidden = YES; } return _starVeiw; } diff --git a/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m b/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m index 3844138d..e60646e5 100644 --- a/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m +++ b/YuMi/Modules/YMMine/View/XPMineCollectRoomListViewController.m @@ -153,7 +153,7 @@ static NSString *lastSelectTab = @"lastSelectTab"; make.left.bottom.right.mas_equalTo(0); }]; [self.allSelectBtn mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(64); + make.height.mas_equalTo(22); make.left.mas_equalTo(15); make.top.mas_equalTo(18); diff --git a/YuMi/Modules/YMNewHome/Model/PIHomeCategoryTitleModel.h b/YuMi/Modules/YMNewHome/Model/PIHomeCategoryTitleModel.h index 0ec9ac77..09b53928 100644 --- a/YuMi/Modules/YMNewHome/Model/PIHomeCategoryTitleModel.h +++ b/YuMi/Modules/YMNewHome/Model/PIHomeCategoryTitleModel.h @@ -15,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN @property(nonatomic,assign) CGFloat noCheckedWidth; @property(nonatomic,copy) NSString *name; @property(nonatomic,copy) NSString *id; +@property(nonatomic,assign) BOOL isHomeRecommen; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m index a7993946..3eec916f 100644 --- a/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m +++ b/YuMi/Modules/YMNewHome/View/Cell/XPNewHomePartyTableViewCell.m @@ -363,6 +363,7 @@ _birthdayView.imageEdgeInsets = UIEdgeInsetsMake(0, -kGetScaleWidth(2), 0, 0); _birthdayView.layer.cornerRadius = kGetScaleWidth(14)/2; _birthdayView.layer.masksToBounds = YES; + } return _birthdayView; } diff --git a/YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m b/YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m index d22c546e..61171c84 100644 --- a/YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m +++ b/YuMi/Modules/YMNewHome/View/XPHomeRecommendViewController.m @@ -401,7 +401,7 @@ UIKIT_EXTERN NSString * const kShieldingNotification; } model.labelsWidthList = widthList; } - self.personalRoomList = [NSMutableArray arrayWithArray:list]; +// self.personalRoomList = [NSMutableArray arrayWithArray:list]; } diff --git a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m index ade2d9b7..76688584 100644 --- a/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m +++ b/YuMi/Modules/YMNewHome/View/XPNewHomeViewController.m @@ -223,15 +223,15 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; } -(void)headerRefresh{ [self initHttp]; - if(self.titleView.index == self.tagModelList.count - 1){ - [self.recommendVC headerRefresh]; - }else{ +// if(self.titleView.index == self.tagModelList.count - 1){ +// [self.recommendVC headerRefresh]; +// }else{ PIHomeCategoryTitleModel *tagModel = [self.tagModelList safeObjectAtIndex1:self.type]; XPHomePartyViewController *homeVC = [self.validListDict objectForKey:[NSNumber numberWithInteger:self.type]]; homeVC.tagModel = tagModel; - } +// } } -(void)openRoomNotification:(NSNotification *)notification{ @@ -421,17 +421,22 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; ///获取所有的tag成功 - (void)getHomeTagListSuccess:(NSArray *)array{ if(array.count == 0)return; - NSMutableArray *list = [NSMutableArray arrayWithArray:array]; -// [list addObject:self.tagModelList.lastObject]; - [list insertObject:self.tagModelList.firstObject atIndex:0]; + NSMutableArray *list = [NSMutableArray new]; + NSMutableArray *titleArray = [NSMutableArray array]; + for (PIHomeCategoryTitleModel *model in array) { + if (model.isHomeRecommen == YES){ + [list insertObject:model atIndex:0]; + [titleArray insertObject:model.name atIndex:0]; + }else{ + [list addObject:model]; + [titleArray addObject:model.name]; + } + } self.tagModelList = list; self.titleView.titleList = self.tagModelList; - NSMutableArray *titleArray = [NSMutableArray array]; - for (PIHomeCategoryTitleModel *model in self.tagModelList) { - [titleArray addObject:model.name]; - } self.titleView.titles = titleArray; [self.titleView reloadData]; + self.titleView.index = 0; } - (void)homeChatPickSuccess:(NSString *)uid { /// 跳聊天 @@ -531,8 +536,8 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; if (!_titleView) { _titleView = [[PIHoemCategoryTitleView alloc] initWithFrame:CGRectZero]; _titleView.delegate = self; - _titleView.titles = @[YMLocalizedString(@"XPNewHomeViewController0")]; - _titleView.titleList = self.tagModelList; + _titleView.titles = @[]; + _titleView.titleList = [@[]mutableCopy]; _titleView.backgroundColor = [UIColor clearColor]; _titleView.titleColor = [UIColor clearColor]; _titleView.titleSelectedColor = [UIColor clearColor]; @@ -571,7 +576,7 @@ UIKIT_EXTERN NSString * const kOpenRoomNotification; hotModel.name = YMLocalizedString(@"XPNewHomeViewController1"); hotModel.checkedWidth = [UILabel getWidthWithText:recommendModel.name height:kGetScaleWidth(44) font:kFontSemibold(16)]; hotModel.noCheckedWidth = [UILabel getWidthWithText:recommendModel.name height:kGetScaleWidth(44) font:kFontRegular(14)]; - [_tagModelList addObject:recommendModel]; +// [_tagModelList addObject:recommendModel]; // [_tagModelList addObject:hotModel]; } return _tagModelList; diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.m b/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.m index 0e6951e6..0c68e03c 100644 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.m +++ b/YuMi/Modules/YMRoom/View/BackMusic/View/SubViews/XPRoomMusicVoiceSettingView.m @@ -73,23 +73,23 @@ }]; [self.userStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(35); + make.height.mas_equalTo(40); }]; [self.userTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(35); + make.width.mas_equalTo(40); }]; [self.userVoiceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(35); + make.width.mas_equalTo(40); }]; [self.musicTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(35); + make.width.mas_equalTo(40); }]; [self.musicVoiceLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(35); + make.width.mas_equalTo(40); }]; } #pragma mark - Event Response diff --git a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m b/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m index b127c0e8..568911a3 100644 --- a/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m +++ b/YuMi/Modules/YMRoom/View/BackMusic/View/XPRoomTransferMusicViewController.m @@ -85,7 +85,8 @@ }]; [self.wifiView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(132, 30)); + make.height.mas_equalTo(30); + make.width.mas_greaterThanOrEqualTo(150); }]; [self.wifiImaegView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -96,7 +97,8 @@ }]; [self.wifiLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.centerX.mas_equalTo(self.wifiView).offset(13); + make.trailing.mas_equalTo(-10); + make.leading.mas_equalTo(37); make.centerY.mas_equalTo(self.wifiView); }]; @@ -138,7 +140,7 @@ self.ipAddress = YMLocalizedString(@"XPRoomTransferMusicViewController3"); self.wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController2"); } else { - self.ipAddress = [NSString stringWithFormat:@"http://%@:%d/",[SJXCSMIPHelper deviceIPAdress],[self.httpServer listeningPort]]; + self.ipAddress = [NSString stringWithFormat:@"http://%@:%d/?lang=%@",[SJXCSMIPHelper deviceIPAdress],[self.httpServer listeningPort],[NSBundle getLanguageText]]; self.wifiLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController5"); } self.ipLabel.text = self.ipAddress; @@ -312,6 +314,7 @@ _singleTypeLabel.font = [UIFont systemFontOfSize:15]; _singleTypeLabel.textColor = [DJDKMIMOMColor mainTextColor]; _singleTypeLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController15"); + _singleTypeLabel.numberOfLines = 0; _singleTypeLabel.textAlignment = NSTextAlignmentCenter; } return _singleTypeLabel; @@ -332,7 +335,7 @@ _descriptionLabel.textColor = [DJDKMIMOMColor mainTextColor]; _descriptionLabel.text = YMLocalizedString(@"XPRoomTransferMusicViewController16"); _descriptionLabel.font = [UIFont systemFontOfSize:13]; - _descriptionLabel.numberOfLines = 2; + _descriptionLabel.numberOfLines = 0; _descriptionLabel.textAlignment = NSTextAlignmentCenter; } return _descriptionLabel; diff --git a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.m b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.m index f91a022e..2a15f081 100644 --- a/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.m +++ b/YuMi/Modules/YMRoom/View/BaseUIContainerView/XPRoomRankEntranceView.m @@ -70,7 +70,8 @@ [self.titleLabel mas_remakeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); - make.left.mas_equalTo(self.rankContentView.mas_right).mas_offset(12); + make.leading.mas_equalTo(self.rankContentView.mas_trailing).mas_offset(12); + make.trailing.mas_equalTo(-4); }]; [self.iconImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(9); @@ -89,7 +90,8 @@ } [self.titleLabel mas_remakeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); - make.left.mas_equalTo(self.rankContentView.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.rankContentView.mas_trailing).mas_offset(4); + make.trailing.mas_equalTo(-4); }]; [self.iconImageView mas_remakeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(9); @@ -110,7 +112,8 @@ }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self); - make.left.mas_equalTo(self.rankContentView.mas_right).mas_offset(4); + make.leading.mas_equalTo(self.rankContentView.mas_trailing).mas_offset(4); + make.trailing.mas_equalTo(-4); }]; [self.iconImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(9); @@ -157,6 +160,7 @@ _iconImageView = [[UIImageView alloc] init]; _iconImageView.image = [UIImage imageNamed:@"room_position_little_game_right_arrow"]; _iconImageView.contentMode = UIViewContentModeScaleAspectFit; + } return _iconImageView; } @@ -167,6 +171,7 @@ _titleLabel.textColor = UIColor.whiteColor; _titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; _titleLabel.text = YMLocalizedString(@"XPRoomRankEntranceView0"); + _titleLabel.numberOfLines = 2; } return _titleLabel; } diff --git a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomListView.m b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomListView.m index 0f947ac8..e095fb6e 100644 --- a/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomListView.m +++ b/YuMi/Modules/YMRoom/View/LittleGame/View/XPLittleGameRoomListView.m @@ -56,7 +56,7 @@ - (void)initSubViewConstraints { [self mas_makeConstraints:^(MASConstraintMaker *make) { - make.width.mas_equalTo(80); + make.width.mas_equalTo(120); make.bottom.mas_equalTo(self.stackView.mas_bottom); }]; diff --git a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m index 3d1499bf..fb86b233 100644 --- a/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m +++ b/YuMi/Modules/YMRoom/View/MenuContainerView/XPRoomMenuContainerView.m @@ -461,6 +461,7 @@ [_inputButton setTitle:YMLocalizedString(@"XPRoomMenuContainerView2") forState:UIControlStateNormal]; [_inputButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; _inputButton.titleLabel.font = [UIFont systemFontOfSize:12]; + _inputButton.titleLabel.numberOfLines = 2; _inputButton.layer.masksToBounds = YES; _inputButton.layer.cornerRadius = 15; [_inputButton setBackgroundImage:[UIImage imageNamed:@"pi_room_menu_bottom_send_bg"] forState:UIControlStateNormal]; diff --git a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m index f5c95fc4..04d5f9f6 100644 --- a/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m +++ b/YuMi/Modules/YMRoom/View/SendGiftView/View/XPGiftHeadTypeView.m @@ -159,10 +159,10 @@ static NSString *kHideGiftViewInteractDot = @"kHideGiftViewInteractDot";//是否 #pragma mark - setter - (void)setIsShowFirstRecharge:(BOOL)isShowFirstRecharge { if (isShowFirstRecharge) { - [self.titleArray addObject:YMLocalizedString(@"XPGiftHeadTypeView1")]; - NSMutableArray *imageList = [[NSMutableArray alloc]initWithArray:self.pi_BannerView.imageURLStringsGroup]; - [imageList addObject:[UIImage getLanguageText:@"gift_first_recharge_bg"]]; - self.pi_BannerView.imageURLStringsGroup = imageList; +// [self.titleArray addObject:YMLocalizedString(@"XPGiftHeadTypeView1")]; +// NSMutableArray *imageList = [[NSMutableArray alloc]initWithArray:self.pi_BannerView.imageURLStringsGroup]; +// [imageList addObject:[UIImage getLanguageText:@"gift_first_recharge_bg"]]; +// self.pi_BannerView.imageURLStringsGroup = imageList; } } diff --git a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m index 09edf2ff..0332bb2f 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/Cell/XPRoomOnlineTableViewCell.m @@ -96,9 +96,9 @@ [self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(25); }]; - + [self.roleButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(38, 15)); + make.height.mas_equalTo( 15); }]; CGFloat width = 28 * 20 / 14; [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -186,11 +186,11 @@ if ([userInfo.memberType isEqualToString:@"CREATOR"]) { self.roleButton.hidden = NO; [self.roleButton setBackgroundColor:[DJDKMIMOMColor appEmphasizeColor2]]; - [self.roleButton setTitle:YMLocalizedString(@"XPRoomOnlineTableViewCell0") forState:UIControlStateNormal]; + [self.roleButton setTitle:[NSString stringWithFormat:@" %@ ",YMLocalizedString(@"XPRoomOnlineTableViewCell0")] forState:UIControlStateNormal]; } else if([userInfo.memberType isEqualToString:@"MANAGER"]) { self.roleButton.hidden = NO; [self.roleButton setBackgroundColor:[DJDKMIMOMColor appEmphasizeColor]]; - [self.roleButton setTitle:YMLocalizedString(@"XPRoomOnlineTableViewCell1") forState:UIControlStateNormal]; + [self.roleButton setTitle:[NSString stringWithFormat:@" %@ ",YMLocalizedString(@"XPRoomOnlineTableViewCell1")] forState:UIControlStateNormal]; } } if(self.roleButton.hidden == NO){ @@ -258,11 +258,11 @@ if (_member.type == NIMTeamMemberTypeOwner) { self.roleButton.hidden = NO; [self.roleButton setBackgroundColor:[DJDKMIMOMColor appEmphasizeColor2]]; - [self.roleButton setTitle:YMLocalizedString(@"XPRoomOnlineTableViewCell0") forState:UIControlStateNormal]; + [self.roleButton setTitle:[NSString stringWithFormat:@" %@ ",YMLocalizedString(@"XPRoomOnlineTableViewCell0")] forState:UIControlStateNormal]; } else if(_member.type == NIMChatroomMemberTypeManager) { self.roleButton.hidden = NO; [self.roleButton setBackgroundColor:[DJDKMIMOMColor appEmphasizeColor]]; - [self.roleButton setTitle:YMLocalizedString(@"XPRoomOnlineTableViewCell1") forState:UIControlStateNormal]; + [self.roleButton setTitle:[NSString stringWithFormat:@" %@ ",YMLocalizedString(@"XPRoomOnlineTableViewCell1")] forState:UIControlStateNormal]; } } diff --git a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m index 32af0981..be47a736 100644 --- a/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m +++ b/YuMi/Modules/YMRoom/View/Setting/View/XPRoomOnLineViewController.m @@ -204,7 +204,7 @@ [tableView deselectRowAtIndexPath:indexPath animated:YES]; if (self.datasource.count > 0) { XPMessageRemoteExtModel * userInfo = [self.datasource safeObjectAtIndex1:indexPath.row]; - if (userInfo.enterHide) { + if (userInfo.userVipInfoVO.enterHide) { return; } RoomInfoModel * roomInfo = self.hostDelegate.getRoomInfo; diff --git a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m index d602ff82..3d4f0e08 100644 --- a/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m +++ b/YuMi/Modules/YMRoom/View/StageView/MicroView/MicroView.m @@ -418,6 +418,7 @@ if (self.roomInfo.type == RoomType_Anchor || (self.roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode && self.roomInfo.roomId > 0) || (self.roomInfo.roomModeType == RoomModeType_Open_Blind && micState.position == 999)) { self.positionCharmImgView.hidden = YES; } + self.nickLabel.text = [NSString stringWithFormat:YMLocalizedString(@"MicroView0"), micState.position + 1]; } -(UserInfoModel *)getUser{ return self.userInfo; @@ -425,7 +426,7 @@ - (void)configUser:(UserInfoModel *)userInfo { self.userInfo = userInfo; if ([ClientConfig shareConfig].canOpen) { - self.nickLabel.text = YMLocalizedString(@"MicroView0"); +// self.nickLabel.text = YMLocalizedString(@"MicroView0"); self.postionLabel.hidden = NO; } else { self.nickLabel.text = YMLocalizedString(@"MicroView1"); diff --git a/YuMi/Modules/YMRoom/View/UserCard/Api/Api+UserCard.h b/YuMi/Modules/YMRoom/View/UserCard/Api/Api+UserCard.h index e46fca12..f6ef6e2e 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/Api/Api+UserCard.h +++ b/YuMi/Modules/YMRoom/View/UserCard/Api/Api+UserCard.h @@ -1,8 +1,8 @@ // // Api+UserCard.h -// YUMI +// xplan-ios // -// Created by YUMI on 2021/11/24. +// Created by 冯硕 on 2021/11/24. // #import "Api.h" @@ -54,12 +54,6 @@ NS_ASSUME_NONNULL_BEGIN /// @param opt 1: 设置为管理员;2:设置普通等级用户;-1:设为黑名单用户;-2:设为禁言用户 /// @param isSet true 设置，false 取消设置 + (void)superAdminHandleUser:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid targetUid:(NSString *)targetUid opt:(NSString *)opt isSet:(NSNumber *)isSet; - -/// 记录踢人名单列表 -/// @param completion 完成 -/// @param roomUid 房间id -/// @param uid 用户id -+(void)recordskickUserList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid uid:(NSString *)uid; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/UserCard/Api/Api+UserCard.m b/YuMi/Modules/YMRoom/View/UserCard/Api/Api+UserCard.m index ad9e4a09..c986a461 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/Api/Api+UserCard.m +++ b/YuMi/Modules/YMRoom/View/UserCard/Api/Api+UserCard.m @@ -1,12 +1,13 @@ // // Api+UserCard.m -// YUMI +// xplan-ios // -// Created by YUMI on 2021/11/24. +// Created by 冯硕 on 2021/11/24. // #import "Api+UserCard.h" -#import + + @implementation Api (UserCard) @@ -16,8 +17,7 @@ /// @param uid 自己的uid /// @param isLikeUid 要查询的那个人的uid + (void)attentionStatusCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid isLikeUid:(NSString *)isLikeUid { - NSString * fang = [NSString stringFromBase64String:@"ZmFucy9pc2xpa2U="];///fans/islike - [self makeRequest:fang method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__, uid, isLikeUid, nil]; + [self makeRequest:@"fans/islike" method:HttpRequestHelperMethodGET completion:completion,__FUNCTION__, uid, isLikeUid, nil]; } /// 关注某人 @@ -27,8 +27,7 @@ /// @param ticket ticket /// @param type 1 关注 2取消关注 + (void)attentionCompletion:(HttpRequestHelperCompletion)completion uid:(NSString *)uid likedUid:(NSString *)likedUid ticket:(NSString *)ticket type:(NSString *)type { - NSString * fang = [NSString stringFromBase64String:@"ZmFucy9saWtl"];///fans/like - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, likedUid, ticket, type, nil]; + [self makeRequest:@"fans/like" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, uid, likedUid, ticket, type, nil]; } @@ -38,8 +37,7 @@ /// @param micUid 需要清除的uid /// @param uid 操作者的uid + (void)cleanMicroGiftValue:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid micUid:(NSString *)micUid uid:(NSString *)uid { - NSString * fang = [NSString stringFromBase64String:@"cm9vbS9naWZ0L3ZhbHVlL2NsZWFu"];///room/gift/value/clean - [self makeRequest:fang method:HttpRequestHelperMethodDELETE completion:completion, __FUNCTION__, roomUid, micUid, uid, nil]; + [self makeRequest:@"room/gift/value/clean" method:HttpRequestHelperMethodDELETE completion:completion, __FUNCTION__, roomUid, micUid, uid, nil]; } /// 心动选人阶段 选择 @@ -48,8 +46,7 @@ /// @param chosenUserId 心动的uid /// @param electorUserId 自己的uid + (void)roomDatingPickUser:(HttpRequestHelperCompletion)completion roomUserId:(NSString *)roomUserId chosenUserId:(NSString *)chosenUserId electorUserId:(NSString *)electorUserId { - NSString * fang = [NSString stringFromBase64String:@"YmxpbmQtZGF0ZS9jb25uZWN0aW9u"];///blind-date/connection - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUserId, chosenUserId, electorUserId, nil]; + [self makeRequest:@"blind-date/connection" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUserId, chosenUserId, electorUserId, nil]; } /// 超管处理房间的人 @@ -59,14 +56,7 @@ /// @param opt 1: 设置为管理员;2:设置普通等级用户;-1:设为黑名单用户;-2:设为禁言用户 /// @param isSet true 设置，false 取消设置 + (void)superAdminHandleUser:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid targetUid:(NSString *)targetUid opt:(NSString *)opt isSet:(NSNumber *)isSet { - NSString * fang = [NSString stringFromBase64String:@"c3VwZXIvc2V0L2NoYXRyb29tL3JvbGU="];///super/set/chatroom/role - [self makeRequest:fang method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, targetUid, opt,isSet, nil]; -} -/// 记录踢人名单列表 -/// @param completion 完成 -/// @param roomUid 房间id -/// @param uid 用户id -+(void)recordskickUserList:(HttpRequestHelperCompletion)completion roomUid:(NSString *)roomUid uid:(NSString *)uid{ - [self makeRequest:@"room/kick/" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, uid, nil]; + [self makeRequest:@"super/set/chatroom/role" method:HttpRequestHelperMethodPOST completion:completion, __FUNCTION__, roomUid, targetUid, opt,isSet, nil]; } + @end diff --git a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.h b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.h index bddb4ea1..38bf8916 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.h +++ b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.h @@ -1,8 +1,8 @@ // -// YMUserCardInfoModel.h -// YUMI +// XPUserCardInfoModel.h +// xplan-ios // -// Created by YUMI on 2021/11/26. +// Created by 冯硕 on 2021/11/26. // #import @@ -12,7 +12,7 @@ #import "GuildSuperAdminInfoModel.h" NS_ASSUME_NONNULL_BEGIN -@interface XPUserCardInfoModel : PIBaseModel +@interface XPUserCardInfoModel : NSObject ///用户的UID @property (nonatomic,copy) NSString *uid; ///如果在坑位上的话 就传入 如果在坑位上的话 就传 如果不再的话 就传nil diff --git a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.m b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.m index 8ff87f21..b449b917 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.m +++ b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardInfoModel.m @@ -1,8 +1,8 @@ // -// YMUserCardInfoModel.m -// YUMI +// XPUserCardInfoModel.m +// xplan-ios // -// Created by YUMI on 2021/11/26. +// Created by 冯硕 on 2021/11/26. // #import "XPUserCardInfoModel.h" diff --git a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardItemModel.h b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardItemModel.h index ece41f48..38bc5218 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardItemModel.h +++ b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardItemModel.h @@ -1,8 +1,8 @@ // -// YMUserCardItemModel.h -// YUMI +// XPUserCardItemModel.h +// xplan-ios // -// Created by YUMI on 2021/11/24. +// Created by 冯硕 on 2021/11/24. // #import @@ -24,10 +24,20 @@ typedef NS_ENUM(NSUInteger, UserCardItemType){ UserCardItemType_Invite_Micro = 7, ///@TA UserCardItemType_AtUser = 8, + ///开麦 闭麦 + UserCardMicroType_Mute , + ///上麦 下麦 + UserCardMicroType_UpDown, + ///锁麦 解锁 + UserCardMicroType_Lock, + ///清除礼物值 + UserCardMicroType_Clean_Gift_Value, + ///送礼物 + UserCardMicroType_Send_Gift, }; -@interface XPUserCardItemModel : PIBaseModel +@interface XPUserCardItemModel : NSObject ///普通状态的图片名字 @property (nonatomic,copy) NSString *imageName; @@ -46,6 +56,15 @@ typedef NS_ENUM(NSUInteger, UserCardItemType){ ///是否可以点击 @property (nonatomic,assign) BOOL isEnable; + + + +///状态 +@property (nonatomic,assign) BOOL status; + +@property (nonatomic,copy) NSString *uid; + + @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardItemModel.m b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardItemModel.m index 41172ac7..503c9fc0 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardItemModel.m +++ b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardItemModel.m @@ -1,8 +1,8 @@ // -// YMUserCardItemModel.m -// YUMI +// XPUserCardItemModel.m +// xplan-ios // -// Created by YUMI on 2021/11/24. +// Created by 冯硕 on 2021/11/24. // #import "XPUserCardItemModel.h" diff --git a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardMicroItemModel.h b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardMicroItemModel.h index 323e17a3..fdd08a78 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardMicroItemModel.h +++ b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardMicroItemModel.h @@ -1,31 +1,38 @@ // -// YMUserCardMicroItemModel.h -// YUMI +// XPUserCardMicroItemModel.h +// xplan-ios // -// Created by YUMI on 2021/11/26. +// Created by 冯硕 on 2021/11/26. // #import - +#import "XPUserCardItemModel.h" NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSInteger, UserCardMicroType) { - ///开麦 闭麦 - UserCardMicroType_Mute = 1, - ///上麦 下麦 - UserCardMicroType_UpDown, - ///锁麦 解锁 - UserCardMicroType_Lock, - ///清除礼物值 - UserCardMicroType_Clean_Gift_Value -}; +//typedef NS_ENUM(NSInteger, UserCardMicroType) { +// ///开麦 闭麦 +// UserCardMicroType_Mute = 1, +// ///上麦 下麦 +// UserCardMicroType_UpDown, +// ///锁麦 解锁 +// UserCardMicroType_Lock, +// ///清除礼物值 +// UserCardMicroType_Clean_Gift_Value, +// ///送礼物 +// UserCardMicroType_Send_Gift, +// +//}; -@interface XPUserCardMicroItemModel : PIBaseModel +@interface XPUserCardMicroItemModel : NSObject ///显示标题 @property (nonatomic,copy) NSString *title; ///类型 -@property (nonatomic,assign) UserCardMicroType type; +@property (nonatomic,assign) UserCardItemType type; ///状态 @property (nonatomic,assign) BOOL status; +/// +@property (nonatomic,copy) NSString *iconImage; +@property (nonatomic,copy) NSString *uid; + @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardMicroItemModel.m b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardMicroItemModel.m index 1a341be2..1f7853b2 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardMicroItemModel.m +++ b/YuMi/Modules/YMRoom/View/UserCard/Model/XPUserCardMicroItemModel.m @@ -1,8 +1,8 @@ // -// YMUserCardMicroItemModel.m -// YUMI +// XPUserCardMicroItemModel.m +// xplan-ios // -// Created by YUMI on 2021/11/26. +// Created by 冯硕 on 2021/11/26. // #import "XPUserCardMicroItemModel.h" diff --git a/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.h b/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.h index 9174c8a1..51586117 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.h +++ b/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.h @@ -1,8 +1,8 @@ // -// YMUserCardPresenter.h -// YUMI +// XPUserCardPresenter.h +// xplan-ios // -// Created by YUMI on 2021/11/24. +// Created by 冯硕 on 2021/11/24. // #import "BaseMvpPresenter.h" @@ -89,11 +89,6 @@ NS_ASSUME_NONNULL_BEGIN /// @param opt 1: 设置为管理员;2:设置普通等级用户;-1:设为黑名单用户;-2:设为禁言用户 /// @param roomUid 房主的uid - (void)superAdminHandleUser:(NSString *)targetUid opt:(NSString *)opt roomUid:(NSString *)roomUid isSet:(BOOL)isSet; -/// 记录踢人名单列表 - -/// @param roomUid 房间id -/// @param uid 用户id --(void)recordsKickUserListWithRoomUid:(NSString *)roomUid uid:(NSString *)uid; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m b/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m index 69e338d4..23dbf553 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m +++ b/YuMi/Modules/YMRoom/View/UserCard/Presenter/XPUserCardPresenter.m @@ -1,8 +1,8 @@ // -// YMUserCardPresenter.m -// YUMI +// XPUserCardPresenter.m +// xplan-ios // -// Created by YUMI on 2021/11/24. +// Created by 冯硕 on 2021/11/24. // #import "XPUserCardPresenter.h" @@ -46,13 +46,13 @@ /// 获取用户信息 /// @param uid 查询的用户的uid - (void)getUserInfo:(NSString *)uid { - if (uid == nil) { - return; - } - [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; - [[self getView] onGetUserInfoSuccess:infoModel]; - }] uid:uid]; + if (uid == nil) { + return; + } + [Api getUserInfo:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + UserInfoModel * infoModel = [UserInfoModel modelWithDictionary:data.data]; + [[self getView] onGetUserInfoSuccess:infoModel]; + }] uid:uid]; } @@ -60,201 +60,210 @@ /// @param uid 自己的uid /// @param targetUid 对方的uid - (void)userAttentionStatus:(NSString *)uid targetUid:(NSString *)targetUid { - [Api attentionStatusCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - BOOL isLike = ((NSNumber *)data.data).boolValue; - self.attentionItem.isSelect = isLike; - [[self getView] onGetFunctionArraySccess:self.functionArray]; - }] uid:uid isLikeUid:targetUid]; + [Api attentionStatusCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + BOOL isLike = ((NSNumber *)data.data).boolValue; + self.attentionItem.isSelect = isLike; + [[self getView] onGetFunctionArraySccess:self.functionArray]; + }errorToast:NO] uid:uid isLikeUid:targetUid]; } /// 获取用户卡片中中间操作按钮的数据源 /// @param userInfo 目标用户 - (void)getFunctionItemsByUserInfo:(XPUserCardInfoModel *)userInfo{ - NSString * uid = [[AccountInfoStorage instance] getUid]; - NSString * targetUid = userInfo.uid; - NSString * roomId = [NSString stringWithFormat:@"%ld", userInfo.roomInfo.roomId]; - if ([uid isEqualToString:targetUid]) { ///查看自己的话 没有中间的数据 - return; - } else { - [self.functionArray removeAllObjects]; + NSString * uid = [[AccountInfoStorage instance] getUid]; + NSString * targetUid = userInfo.uid; + NSString * roomId = [NSString stringWithFormat:@"%ld", userInfo.roomInfo.roomId]; + if ([uid isEqualToString:targetUid]) { ///查看自己的话 没有中间的数据 + [[self getView] onGetFunctionArraySccess:@[]]; + return; + } else { + [self.functionArray removeAllObjects]; if (!userInfo.hideSendGiftItem) { [self.functionArray addObject:self.giftItem]; } - [self.functionArray addObject:self.chatItem]; + [self.functionArray addObject:self.chatItem]; [self.functionArray addObject:self.atItem]; - [self.functionArray addObject:self.attentionItem]; - ///获取一下关注的状态 - [self userAttentionStatus:uid targetUid:targetUid]; - ///自己是公会超管 - BOOL meIsSuperAdmin = NO; - ///用户卡片的那个人事公会超管 - BOOL heIsSuperAdmin = NO; - for (GuildSuperAdminInfoModel *managerInfo in userInfo.superMangerList) { - if ([managerInfo.uid isEqualToString:userInfo.uid]) { - heIsSuperAdmin = YES; - } - if ([managerInfo.uid isEqualToString:[AccountInfoStorage instance].getUid]) { - meIsSuperAdmin = YES; - } - } - @weakify(self); - if (meIsSuperAdmin) { - if (heIsSuperAdmin) { - [[self getView] onGetFunctionArraySccess:self.functionArray]; - } else { - ///查看 目标用户是否是管理员 - [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { - NIMChatroomMember * targetMember = x; - if (targetMember == nil) {return;} - if (targetMember.type == NIMChatroomMemberTypeCreator) { ///目标是房主的话 - [[self getView] onGetFunctionArraySccess:self.functionArray]; - } else { - if (targetMember && targetMember.type == NIMChatroomMemberTypeManager) { - self.managerItem.isSelect = YES; - } - [self.functionArray addObject:self.managerItem]; - [self.functionArray addObject:self.kikoutItem]; - [self.functionArray addObject:self.blackItem]; - [[self getView] onGetFunctionArraySccess:self.functionArray]; - } - }]; - } - } else { - [[self rac_queryChatRoomMember:uid roomId:roomId] subscribeNext:^(id _Nullable x) { - @strongify(self); - NIMChatroomMember * member = x; - if (member == nil) {return;} - if (member.type == NIMChatroomMemberTypeCreator) {///房主 踢出房间 设置管理员 拉黑 - if (heIsSuperAdmin) { - [[self getView] onGetFunctionArraySccess:self.functionArray]; - } else { - [self.functionArray addObject:self.kikoutItem]; - [self.functionArray addObject:self.managerItem]; - [self.functionArray addObject:self.blackItem]; - ///查看 目标用户是否是管理员 - [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { - NIMChatroomMember * targetMember = x; - if (targetMember && targetMember.type == NIMChatroomMemberTypeManager) { - self.managerItem.isSelect = YES; - } - [[self getView] onGetFunctionArraySccess:self.functionArray]; - }]; - } - } else if(member.type == NIMChatroomMemberTypeManager) {///操作者是 管理员 踢出房间 拉黑 - ///查看 目标用户是否是管理员 - [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { - NIMChatroomMember * targetMember = x; - if (targetMember == nil) {return;} - if (targetMember.type == NIMChatroomMemberTypeManager || targetMember.type == NIMChatroomMemberTypeCreator || heIsSuperAdmin) { ///目标是管理员 - [[self getView] onGetFunctionArraySccess:self.functionArray]; - } else { - [self.functionArray addObject:self.kikoutItem]; - [self.functionArray addObject:self.blackItem]; - [[self getView] onGetFunctionArraySccess:self.functionArray]; - } - }]; - } else { - [[self getView] onGetFunctionArraySccess:self.functionArray]; - } - }]; - } - } + [self.functionArray addObject:self.attentionItem]; + ///获取一下关注的状态 + [self userAttentionStatus:uid targetUid:targetUid]; + ///自己是公会超管 + BOOL meIsSuperAdmin = NO; + ///用户卡片的那个人事公会超管 + BOOL heIsSuperAdmin = NO; + for (GuildSuperAdminInfoModel *managerInfo in userInfo.superMangerList) { + if ([managerInfo.uid isEqualToString:userInfo.uid]) { + heIsSuperAdmin = YES; + } + if ([managerInfo.uid isEqualToString:[AccountInfoStorage instance].getUid]) { + meIsSuperAdmin = YES; + } + } + @weakify(self); + if (meIsSuperAdmin) { + if (heIsSuperAdmin) { + [[self getView] onGetFunctionArraySccess:self.functionArray]; + } else { + ///查看 目标用户是否是管理员 + [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { + NIMChatroomMember * targetMember = x; + if (targetMember == nil) {return;} + if (targetMember.type == NIMChatroomMemberTypeCreator) { ///目标是房主的话 + [[self getView] onGetFunctionArraySccess:self.functionArray]; + } else { + if (targetMember && targetMember.type == NIMChatroomMemberTypeManager) { + self.managerItem.isSelect = YES; + } + [self.functionArray addObject:self.managerItem]; + [self.functionArray addObject:self.kikoutItem]; + [self.functionArray addObject:self.blackItem]; + [[self getView] onGetFunctionArraySccess:self.functionArray]; + } + }]; + } + } else { + [[self rac_queryChatRoomMember:uid roomId:roomId] subscribeNext:^(id _Nullable x) { + @strongify(self); + NIMChatroomMember * member = x; + if (member == nil) {return;} + if (member.type == NIMChatroomMemberTypeCreator) {///房主 踢出房间 设置管理员 拉黑 + if (heIsSuperAdmin) { + [[self getView] onGetFunctionArraySccess:self.functionArray]; + } else { + [self.functionArray addObject:self.kikoutItem]; + [self.functionArray addObject:self.managerItem]; + [self.functionArray addObject:self.blackItem]; + ///查看 目标用户是否是管理员 + [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { + NIMChatroomMember * targetMember = x; + if (targetMember && targetMember.type == NIMChatroomMemberTypeManager) { + self.managerItem.isSelect = YES; + } + [[self getView] onGetFunctionArraySccess:self.functionArray]; + }]; + } + } else if(member.type == NIMChatroomMemberTypeManager) {///操作者是 管理员 踢出房间 拉黑 + ///查看 目标用户是否是管理员 + [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { + NIMChatroomMember * targetMember = x; + if (targetMember == nil) {return;} + if (targetMember.type == NIMChatroomMemberTypeManager || targetMember.type == NIMChatroomMemberTypeCreator || heIsSuperAdmin) { ///目标是管理员 + [[self getView] onGetFunctionArraySccess:self.functionArray]; + } else { + [self.functionArray addObject:self.kikoutItem]; + [self.functionArray addObject:self.blackItem]; + [[self getView] onGetFunctionArraySccess:self.functionArray]; + } + }]; + } else { + [[self getView] onGetFunctionArraySccess:self.functionArray]; + } + }]; + } + } } ///抱她上麦的 数据 /// @param micCount 当前麦序的个数 - (void)getRoomMicroItems:(int)micCount cardInfo:(XPUserCardInfoModel *)cardInfo { - [self.functionArray removeAllObjects]; - RoomInfoModel * roomInfo = cardInfo.roomInfo; - NSMutableDictionary * micQueue = cardInfo.micQueue; - for (int i = 0; i < micCount; i++) { - XPUserCardItemModel * item = [[XPUserCardItemModel alloc] init]; - item.type = UserCardItemType_Invite_Micro; - if (i == 0) { - item.title = roomInfo.roomModeType == RoomModeType_Open_Blind ?YMLocalizedString(@"XPUserCardPresenter21") : YMLocalizedString(@"XPUserCardPresenter1"); - item.imageName = roomInfo.leaveMode ? @"usercard_invite_micro_owner_disable" : @"usercard_invite_micro_owner"; - if (roomInfo.leaveMode) { - item.isEnable = NO; - } - } else { - if (roomInfo.roomModeType == RoomModeType_Open_Blind) { - if (i == 1 || i == 2 || i == 5 || i == 6) { - item.title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardPresenter2"), i]; - } else{ - item.title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardPresenter3"), i]; - } - } else { - item.title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardPresenter4"), i]; - } - - } - MicroQueueModel * micModel = [micQueue objectForKey:[NSString stringWithFormat:@"%d", i -1]]; - if (micModel && micModel.userInfo && micModel.userInfo.uid > 0) { - item.isEnable = NO; - item.imageName = @"usercard_invite_micro_disable"; - } else { - item.isEnable = YES; - item.imageName = @"usercard_invite_micro_normal"; - } - item.position = [NSString stringWithFormat:@"%d", (i - 1)]; - [self.functionArray addObject:item]; - } - [[self getView] onGetFunctionArraySccess:self.functionArray]; + [self.functionArray removeAllObjects]; + RoomInfoModel * roomInfo = cardInfo.roomInfo; + NSMutableDictionary * micQueue = cardInfo.micQueue; + for (int i = 0; i < micCount; i++) { + XPUserCardItemModel * item = [[XPUserCardItemModel alloc] init]; + item.type = UserCardItemType_Invite_Micro; + if (i == 0) { + item.title = roomInfo.roomModeType == RoomModeType_Open_Blind ? YMLocalizedString(@"XPUserCardPresenter0") : YMLocalizedString(@"XPUserCardPresenter1"); + item.imageName = roomInfo.leaveMode ? @"usercard_invite_micro_owner_disable" : @"usercard_invite_micro_owner"; + if (roomInfo.leaveMode) { + item.isEnable = NO; + } + } else { + if (roomInfo.roomModeType == RoomModeType_Open_Blind) { + if (i == 1 || i == 2 || i == 5 || i == 6) { + item.title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardPresenter2"), i]; + } else{ + item.title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardPresenter3"), i]; + } + } else { + item.title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardPresenter4"), i]; + } + + } + // targetMember.type != NIMChatroomMemberTypeCreator + MicroQueueModel * micModel = [micQueue objectForKey:[NSString stringWithFormat:@"%d", i -1]]; + if ((micModel && micModel.userInfo && micModel.userInfo.uid > 0) || micModel.microState.position == -1) { + item.isEnable = NO; + item.imageName = @"usercard_invite_micro_disable"; + } else { + + item.isEnable = YES; + item.imageName = @"usercard_invite_micro_normal"; + } + item.position = [NSString stringWithFormat:@"%d", (i - 1)]; + [self.functionArray addObject:item]; + } + [[self getView] onGetFunctionArraySccess:self.functionArray]; } /// 用户卡片底部的操作按钮 /// @param userInfo 目标用户的信息 - (void)getMicroFunctionItemsByUserInfo:(XPUserCardInfoModel *)userInfo { - NSString * uid = [[AccountInfoStorage instance] getUid]; - NSString * targetUid = userInfo.uid; - RoomInfoModel * roomInfo = userInfo.roomInfo; - NSString * roomId = [NSString stringWithFormat:@"%ld", userInfo.roomInfo.roomId]; - MicroQueueModel * micQueue = [userInfo.micQueue objectForKey:userInfo.position]; - NSMutableArray * array = [NSMutableArray array]; - XPUserCardMicroItemModel * muteItem = [[XPUserCardMicroItemModel alloc] init]; - muteItem.title = userInfo.micState == MicroMicStateType_Open ? YMLocalizedString(@"StageView25") : YMLocalizedString(@"XPUserCardPresenter6"); - muteItem.status = userInfo.micState == MicroMicStateType_Open; - muteItem.type = UserCardMicroType_Mute; - - XPUserCardMicroItemModel * upDownItem = [[XPUserCardMicroItemModel alloc] init]; - upDownItem.title = userInfo.position.length <= 0 ? YMLocalizedString(@"StageView18") : [uid isEqualToString:targetUid] ? YMLocalizedString(@"StageView28") : YMLocalizedString(@"XPUserCardPresenter9"); - upDownItem.status = userInfo.position.length > 0 ? YES : NO; - upDownItem.type = UserCardMicroType_UpDown; - - XPUserCardMicroItemModel * lockItem = [[XPUserCardMicroItemModel alloc] init]; - lockItem.title = userInfo.posState == MicroPosStateType_Free ? YMLocalizedString(@"StageView23") : YMLocalizedString(@"XPUserCardPresenter11"); - lockItem.status = userInfo.posState == MicroPosStateType_Free; - lockItem.type = UserCardMicroType_Lock; - - XPUserCardMicroItemModel * giftValueItem = [[XPUserCardMicroItemModel alloc] init]; - giftValueItem.title = YMLocalizedString(@"XPUserCardPresenter12"); - giftValueItem.type = UserCardMicroType_Clean_Gift_Value; - ///自己是公会超管 - BOOL meIsSuperAdmin = NO; - ///用户卡片的那个人事公会超管 - BOOL heIsSuperAdmin = NO; - for (GuildSuperAdminInfoModel *managerInfo in userInfo.superMangerList) { - if ([managerInfo.uid isEqualToString:userInfo.uid]) { - heIsSuperAdmin = YES; - } - if ([managerInfo.uid isEqualToString:[AccountInfoStorage instance].getUid]) { - meIsSuperAdmin = YES; - } - } - if ([targetUid isEqualToString:uid]) {///自己看自己 - @weakify(self); - [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { - @strongify(self); - NIMChatroomMember * member = x; - if (member == nil) {return;} + NSString * uid = [[AccountInfoStorage instance] getUid]; + NSString * targetUid = userInfo.uid; + RoomInfoModel * roomInfo = userInfo.roomInfo; + NSString * roomId = [NSString stringWithFormat:@"%ld", userInfo.roomInfo.roomId]; + MicroQueueModel * micQueue = [userInfo.micQueue objectForKey:userInfo.position]; + NSMutableArray * array = [NSMutableArray array]; + XPUserCardMicroItemModel * muteItem = [[XPUserCardMicroItemModel alloc] init]; + muteItem.title = userInfo.micState == MicroMicStateType_Open ? YMLocalizedString(@"XPUserCardPresenter5") : YMLocalizedString(@"XPUserCardPresenter6"); + muteItem.iconImage = userInfo.micState == MicroMicStateType_Open ? @"user_card_close_mic" : @"user_card_open_mic"; + muteItem.status = userInfo.micState == MicroMicStateType_Open; + muteItem.type = UserCardMicroType_Mute; + + XPUserCardMicroItemModel * upDownItem = [[XPUserCardMicroItemModel alloc] init]; + upDownItem.title = userInfo.position.length <= 0 ? YMLocalizedString(@"XPUserCardPresenter7") : [uid isEqualToString:targetUid] ? YMLocalizedString(@"XPUserCardPresenter8") : YMLocalizedString(@"XPUserCardPresenter9"); + upDownItem.status = userInfo.position.length > 0 ? YES : NO; + upDownItem.type = UserCardMicroType_UpDown; + upDownItem.uid = userInfo.uid; + upDownItem.iconImage = @"user_card_down_mic_listen"; + + XPUserCardMicroItemModel * lockItem = [[XPUserCardMicroItemModel alloc] init]; + lockItem.title = userInfo.posState == MicroPosStateType_Free ? YMLocalizedString(@"XPUserCardPresenter10") : YMLocalizedString(@"XPUserCardPresenter11"); + lockItem.iconImage = userInfo.posState == MicroPosStateType_Free ? @"user_card_lock_mic" : @"user_card_no_lock_mic"; + lockItem.status = userInfo.posState == MicroPosStateType_Free; + lockItem.type = UserCardMicroType_Lock; + + + + XPUserCardMicroItemModel * giftValueItem = [[XPUserCardMicroItemModel alloc] init]; + giftValueItem.title = YMLocalizedString(@"XPUserCardPresenter12"); + giftValueItem.iconImage = @"user_card_clean_gift_value"; + giftValueItem.type = UserCardMicroType_Clean_Gift_Value; + ///自己是公会超管 + BOOL meIsSuperAdmin = NO; + ///用户卡片的那个人事公会超管 + BOOL heIsSuperAdmin = NO; + for (GuildSuperAdminInfoModel *managerInfo in userInfo.superMangerList) { + if ([managerInfo.uid isEqualToString:userInfo.uid]) { + heIsSuperAdmin = YES; + } + if ([managerInfo.uid isEqualToString:[AccountInfoStorage instance].getUid]) { + meIsSuperAdmin = YES; + } + } + if ([targetUid isEqualToString:uid]) {///自己看自己 + @weakify(self); + [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { + @strongify(self); + NIMChatroomMember * member = x; + if (member == nil) {return;} if (userInfo.roomInfo.type == RoomType_Anchor) {///个播房点击自己 if (member.type == NIMChatroomMemberTypeCreator) { [array addObject:muteItem]; - [array addObject:lockItem]; - if (roomInfo.showGiftValue) { - [array addObject:giftValueItem]; - } + if (roomInfo.showGiftValue) { + [array addObject:giftValueItem]; + } } else if(member.type == NIMTeamMemberTypeManager || meIsSuperAdmin) { [array addObject:muteItem]; if (userInfo.position.length > 0) { @@ -278,9 +287,9 @@ [array addObject:muteItem]; [array addObject:upDownItem]; [array addObject:lockItem]; - if (roomInfo.showGiftValue) { - [array addObject:giftValueItem]; - } + if (roomInfo.showGiftValue) { + [array addObject:giftValueItem]; + } } else { if (userInfo.position.length > 0) { [array addObject:muteItem]; @@ -288,9 +297,9 @@ if (![userInfo.position isEqualToString:@"999"]) { [array addObject:lockItem]; } - if (roomInfo.showGiftValue) { - [array addObject:giftValueItem]; - } + if (roomInfo.showGiftValue) { + [array addObject:giftValueItem]; + } } else { [array addObject:upDownItem]; } @@ -301,107 +310,111 @@ } } } - [[self getView] onGetMicroFunctionArraySuccess:array]; - }]; - } else {///不是自己看自己 - @weakify(self); - [[self rac_queryChatRoomMember:uid roomId:roomId] subscribeNext:^(id _Nullable x) { - @strongify(self); - NIMChatroomMember * member = x; - if (member == nil) {return;} - if (member.type == NIMChatroomMemberTypeCreator) { - if (userInfo.position.length > 0) { - if (micQueue.userInfo.vipMic) { - [array addObject:muteItem]; - if (roomInfo.showGiftValue) { - [array addObject:giftValueItem]; - } - } else { - [array addObject:muteItem]; - [array addObject:upDownItem]; - [array addObject:lockItem]; - if (userInfo.roomInfo.type != RoomType_Anchor) {//非个播房显示清除礼物值 - if (roomInfo.showGiftValue) { - [array addObject:giftValueItem]; - } - } - } - } else { - [array addObject:upDownItem]; - } - if (userInfo.roomInfo.type == RoomType_Anchor && userInfo.roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) { - [array removeAllObjects]; - } - [[self getView] onGetMicroFunctionArraySuccess:array]; - } else if(member.type == NIMChatroomMemberTypeManager || meIsSuperAdmin) {/// 管理员 - [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { - NIMChatroomMember * targetMember = x; - if (targetMember == nil) {return;} - if (userInfo.roomInfo.type == RoomType_Anchor) {//个播模式 - if (userInfo.position.length > 0) { - if (targetMember.type != NIMChatroomMemberTypeManager && targetMember.type != NIMChatroomMemberTypeCreator) { - [array addObject:muteItem]; - } - if (targetMember.type != NIMChatroomMemberTypeCreator) { - [array addObject:upDownItem]; - } - [array addObject:lockItem]; - } - - if (userInfo.uid.integerValue == userInfo.roomInfo.uid && [userInfo.position isEqualToString:@"-1"]) { - [array addObject:giftValueItem]; - } - - } else { - if (targetMember.type == NIMChatroomMemberTypeCreator) { - if (userInfo.position.length > 0) { - if (!micQueue.userInfo.vipMic) { - [array addObject:lockItem]; - } - } else { - [array addObject:upDownItem]; - } - if (roomInfo.showGiftValue) { - [array addObject:giftValueItem]; - } - } else {///目标者是普通用户 - if (userInfo.position.length > 0) { - if (targetMember.type != NIMChatroomMemberTypeManager) { - [array addObject:muteItem]; - } - if (!micQueue.userInfo.vipMic) { - [array addObject:upDownItem]; - [array addObject:lockItem]; - } - if (roomInfo.showGiftValue) { - [array addObject:giftValueItem]; - } - } else { - [array addObject:upDownItem]; - } - } - } - if (userInfo.roomInfo.type == RoomType_Anchor && userInfo.roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) { - [array removeAllObjects]; - } - [[self getView] onGetMicroFunctionArraySuccess:array]; - }]; - } - }]; - } + [[self getView] onGetMicroFunctionArraySuccess:array]; + }]; + } else {///不是自己看自己 + @weakify(self); + [[self rac_queryChatRoomMember:uid roomId:roomId] subscribeNext:^(id _Nullable x) { + @strongify(self); + NIMChatroomMember * member = x; + if (member == nil) {return;} + if (member.type == NIMChatroomMemberTypeCreator) { + if (userInfo.position.length > 0) { + if (micQueue.userInfo.vipMic) { + [array addObject:muteItem]; + if (roomInfo.showGiftValue) { + [array addObject:giftValueItem]; + } + } else { + [array addObject:muteItem]; + [array addObject:upDownItem]; + [array addObject:lockItem]; + if (userInfo.roomInfo.type != RoomType_Anchor) {//非个播房显示清除礼物值 + if (roomInfo.showGiftValue) { + [array addObject:giftValueItem]; + } + } + } + } else { + [array addObject:upDownItem]; + } + if (userInfo.roomInfo.type == RoomType_Anchor && userInfo.roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) { + [array removeAllObjects]; + } + [[self getView] onGetMicroFunctionArraySuccess:array]; + } else if(member.type == NIMChatroomMemberTypeManager || meIsSuperAdmin) {/// 管理员 + [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { + NIMChatroomMember * targetMember = x; + if (targetMember == nil) {return;} + if (userInfo.roomInfo.type == RoomType_Anchor) {//个播模式 + if (userInfo.position.length > 0) { + if (targetMember.type != NIMChatroomMemberTypeManager && targetMember.type != NIMChatroomMemberTypeCreator) { + [array addObject:muteItem]; + } + if (targetMember.type != NIMChatroomMemberTypeCreator) { + [array addObject:upDownItem]; + } + [array addObject:lockItem]; + }else{ + if (targetMember.type != NIMChatroomMemberTypeCreator) { + [array addObject:upDownItem]; + } + } + + if (userInfo.uid.integerValue == userInfo.roomInfo.uid && [userInfo.position isEqualToString:@"-1"]) { + [array addObject:giftValueItem]; + } + + } else { + if (targetMember.type == NIMChatroomMemberTypeCreator) { + if (userInfo.position.length > 0) { + if (!micQueue.userInfo.vipMic) { + [array addObject:lockItem]; + } + } else { + [array addObject:upDownItem]; + } + if (roomInfo.showGiftValue) { + [array addObject:giftValueItem]; + } + } else {///目标者是普通用户 + if (userInfo.position.length > 0) { + if (targetMember.type != NIMChatroomMemberTypeManager) { + [array addObject:muteItem]; + } + if (!micQueue.userInfo.vipMic) { + [array addObject:upDownItem]; + [array addObject:lockItem]; + } + if (roomInfo.showGiftValue) { + [array addObject:giftValueItem]; + } + } else { + [array addObject:upDownItem]; + } + } + } + if (userInfo.roomInfo.type == RoomType_Anchor && userInfo.roomInfo.roomModeType == RoomModeType_Open_AcrossRoomPK_mode) { + [array removeAllObjects]; + } + [[self getView] onGetMicroFunctionArraySuccess:array]; + }]; + } + }]; + } } /// 关注用户 /取消该关注 /// @param targetUid 目标用户的uid /// @param status 是否关注 yes 关注 NO 取消关注 - (void)attentionUser:(NSString *)targetUid status:(BOOL)status { - NSString * uid = [[AccountInfoStorage instance] getUid]; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * type = status ? @"1" : @"2"; - [Api attentionCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - self.attentionItem.isSelect = status; - [[self getView] attentionUserSuccess:self.attentionItem]; - }] uid:uid likedUid:targetUid ticket:ticket type:type]; + NSString * uid = [[AccountInfoStorage instance] getUid]; + NSString * ticket = [[AccountInfoStorage instance] getTicket]; + NSString * type = status ? @"1" : @"2"; + [Api attentionCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + self.attentionItem.isSelect = status; + [[self getView] attentionUserSuccess:self.attentionItem]; + }] uid:uid likedUid:targetUid ticket:ticket type:type]; } @@ -409,13 +422,13 @@ /// @param targetUid 目标用户的uid /// @param roomId 房间的uid - (void)makeUserBlack:(NSString *)targetUid roomId:(NSString *)roomId{ - NIMChatroomMemberUpdateRequest *request = [[NIMChatroomMemberUpdateRequest alloc]init]; - request.roomId = roomId; - request.userId = targetUid; - request.enable = YES; - [[NIMSDK sharedSDK].chatroomManager updateMemberBlack:request completion:^(NSError * _Nullable error) { - [[self getView] makeUserBlackFinish:error]; - }]; + NIMChatroomMemberUpdateRequest *request = [[NIMChatroomMemberUpdateRequest alloc]init]; + request.roomId = roomId; + request.userId = targetUid; + request.enable = YES; + [[NIMSDK sharedSDK].chatroomManager updateMemberBlack:request completion:^(NSError * _Nullable error) { + [[self getView] makeUserBlackFinish:error]; + }]; } @@ -424,16 +437,16 @@ /// @param roomId 房间的id /// @param enable YES设置 NO取消 - (void)makeUserManager:(NSString *)targetUid roomId:(NSString *)roomId enable:(BOOL)enable{ - NIMChatroomMemberUpdateRequest *request = [[NIMChatroomMemberUpdateRequest alloc]init]; - request.roomId = roomId; - request.userId = targetUid; - request.enable = enable; - [[NIMSDK sharedSDK].chatroomManager markMemberManager:request completion:^(NSError * _Nullable error) { - if (error == nil) { - self.managerItem.isSelect = enable; - } - [[self getView] markUserManagerFinish:self.managerItem error:error]; - }]; + NIMChatroomMemberUpdateRequest *request = [[NIMChatroomMemberUpdateRequest alloc]init]; + request.roomId = roomId; + request.userId = targetUid; + request.enable = enable; + [[NIMSDK sharedSDK].chatroomManager markMemberManager:request completion:^(NSError * _Nullable error) { + if (error == nil) { + self.managerItem.isSelect = enable; + } + [[self getView] markUserManagerFinish:self.managerItem error:error]; + }]; } @@ -441,53 +454,49 @@ /// @param targetUid 用户的uid /// @param roomId 房间的uid - (void)makeKickUser:(NSString *)targetUid roomId:(NSString *)roomId { - NSString * uid = [[AccountInfoStorage instance] getUid]; - NIMChatroomMemberKickRequest *request = [[NIMChatroomMemberKickRequest alloc] init]; - request.roomId = roomId; - request.userId = targetUid; - if(targetUid != nil && uid != nil){ - request.notifyExt = [@{@"reason":@"kick",@"account":targetUid,@"handleUid":uid} toJSONString]; - } - [[NIMSDK sharedSDK].chatroomManager kickMember:request completion:^(NSError * _Nullable error) { - - - [[self getView] makeKickUserFinish:error uid:targetUid]; - }]; + NSString * uid = [[AccountInfoStorage instance] getUid]; + NIMChatroomMemberKickRequest *request = [[NIMChatroomMemberKickRequest alloc] init]; + request.roomId = roomId; + request.userId = targetUid; + request.notifyExt = [@{@"reason":@"kick",@"account":targetUid,@"handleUid":uid} toJSONString]; + [[NIMSDK sharedSDK].chatroomManager kickMember:request completion:^(NSError * _Nullable error) { + [[self getView] makeKickUserFinish:error]; + }]; } /// 超管踢管理员 /// @param targetNick 目标用户的昵称 /// @param cardInfo 用户信息 - (void)superAdminKickUser:(NSString *)targetNick cardInfo:(XPUserCardInfoModel *)cardInfo { - NSString * targetUid = cardInfo.uid; - NSString * roomId = [NSString stringWithFormat:@"%ld", cardInfo.roomInfo.roomId]; - [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { - NIMChatroomMember * member = x; - if (member == nil) {return;} - if (member.type == NIMChatroomMemberTypeManager) { - XPKickUserModel *notifyModel = [[XPKickUserModel alloc] init]; - notifyModel.handleNick = cardInfo.nick; - notifyModel.handleUid = [AccountInfoStorage instance].getUid.integerValue; - notifyModel.targetUid = cardInfo.uid.integerValue; - notifyModel.targetNick = targetNick; - AttachmentModel *attachment = [[AttachmentModel alloc] init]; - attachment.first = CustomMessageType_Hall_Super_Admin; - attachment.second = Custom_Message_Sub_Hall_Super_Admin_Kick_Manager_Out_Room; - attachment.data = [notifyModel model2dictionary]; - NSString * sessionId = [NSString stringWithFormat:@"%ld", cardInfo.roomInfo.roomId]; - NIMMessage *message = [[NIMMessage alloc]init]; - NIMCustomObject *object = [[NIMCustomObject alloc] init]; - object.attachment = attachment; - message.messageObject = object; - //构造会话 - NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; - NSError * error; - [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:&error]; - [[self getView] superAdminKickUserFinish:error]; - } else { - [self makeKickUser:cardInfo.uid roomId:roomId]; - } - }]; + NSString * targetUid = cardInfo.uid; + NSString * roomId = [NSString stringWithFormat:@"%ld", cardInfo.roomInfo.roomId]; + [[self rac_queryChatRoomMember:targetUid roomId:roomId] subscribeNext:^(id _Nullable x) { + NIMChatroomMember * member = x; + if (member == nil) {return;} + if (member.type == NIMChatroomMemberTypeManager) { + XPKickUserModel *notifyModel = [[XPKickUserModel alloc] init]; + notifyModel.handleNick = cardInfo.nick; + notifyModel.handleUid = [AccountInfoStorage instance].getUid.integerValue; + notifyModel.targetUid = cardInfo.uid.integerValue; + notifyModel.targetNick = targetNick; + AttachmentModel *attachment = [[AttachmentModel alloc] init]; + attachment.first = CustomMessageType_Hall_Super_Admin; + attachment.second = Custom_Message_Sub_Hall_Super_Admin_Kick_Manager_Out_Room; + attachment.data = [notifyModel model2dictionary]; + NSString * sessionId = [NSString stringWithFormat:@"%ld", cardInfo.roomInfo.roomId]; + NIMMessage *message = [[NIMMessage alloc]init]; + NIMCustomObject *object = [[NIMCustomObject alloc] init]; + object.attachment = attachment; + message.messageObject = object; + //构造会话 + NIMSession *session = [NIMSession session:sessionId type:NIMSessionTypeChatroom]; + NSError * error; + [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:session error:&error]; + [[self getView] superAdminKickUserFinish:error]; + } else { + [self makeKickUser:cardInfo.uid roomId:roomId]; + } + }]; } /// 闭麦 开麦 @@ -495,12 +504,12 @@ /// @param state NO 开麦 YES 闭麦 /// @param position 操作的坑位 - (void)microMute:(NSString *)roomUid state:(BOOL)state position:(NSString *)position { - NSString * uid = [[AccountInfoStorage instance] getUid]; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * stateStr = state ? @"1" : @"0"; - [Api microMuteCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] muteMicroSusccess]; - }] roomUid:roomUid state:stateStr position:position ticket:ticket uid:uid]; + NSString * uid = [[AccountInfoStorage instance] getUid]; + NSString * ticket = [[AccountInfoStorage instance] getTicket]; + NSString * stateStr = state ? @"1" : @"0"; + [Api microMuteCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [[self getView] muteMicroSusccess]; + }] roomUid:roomUid state:stateStr position:position ticket:ticket uid:uid]; } // 锁麦 开锁 @@ -508,26 +517,26 @@ /// @param state YES 锁坑位，NO取消锁 /// @param position 操作的坑位 - (void)microLock:(NSString *)roomUid state:(BOOL)state position:(NSString *)position { - NSString * uid = [[AccountInfoStorage instance] getUid]; - NSString * ticket = [[AccountInfoStorage instance] getTicket]; - NSString * stateStr = state ? @"1" : @"0"; - [Api microLockCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] lockMicroSusccess]; - }] roomUid:roomUid state:stateStr position:position ticket:ticket uid:uid]; + NSString * uid = [[AccountInfoStorage instance] getUid]; + NSString * ticket = [[AccountInfoStorage instance] getTicket]; + NSString * stateStr = state ? @"1" : @"0"; + [Api microLockCompletion:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [[self getView] lockMicroSusccess]; + }] roomUid:roomUid state:stateStr position:position ticket:ticket uid:uid]; } /// 抱下麦 /// @param position 坑位信息 /// @param roomId 房间id - (void)kickDownMicro:(NSString *)position roomId:(NSString *)roomId { - NIMChatroomQueueRemoveRequest *request = [[NIMChatroomQueueRemoveRequest alloc]init]; - request.key = position; - request.roomId = roomId; - [[NIMSDK sharedSDK].chatroomManager removeChatroomQueueObject:request completion:^(NSError * _Nullable error, NSDictionary * _Nullable element) { - if (error == nil ) { - [[self getView] kickDownMicroSuccess]; - } - }]; + NIMChatroomQueueRemoveRequest *request = [[NIMChatroomQueueRemoveRequest alloc]init]; + request.key = position; + request.roomId = roomId; + [[NIMSDK sharedSDK].chatroomManager removeChatroomQueueObject:request completion:^(NSError * _Nullable error, NSDictionary * _Nullable element) { + if (error == nil ) { + [[self getView] kickDownMicroSuccess]; + } + }]; } @@ -536,16 +545,16 @@ /// @param position 抱到几号坑 /// @param userInfo 用户信息 - (void)upMicro:(NSString *)roomId position:(NSString *)position userInfo:(UserInfoModel *)userInfo { - NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; - request.key = position; - request.value = [userInfo toJSONString]; - request.roomId = roomId; - request.transient = YES; - [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { - if (error == nil) { - [[self getView] upMicroSuccess]; - } - }]; + NIMChatroomQueueUpdateRequest *request = [[NIMChatroomQueueUpdateRequest alloc]init]; + request.key = position; + request.value = [userInfo toJSONString]; + request.roomId = roomId; + request.transient = YES; + [[NIMSDK sharedSDK].chatroomManager updateChatroomQueueObject:request completion:^(NSError * _Nullable error) { + if (error == nil) { + [[self getView] upMicroSuccess]; + } + }]; } @@ -553,10 +562,10 @@ /// @param roomUid 房间的uid /// @param micUid 被清除的uid - (void)cleanUserGiftValue:(NSString *)roomUid micUid:(NSString *)micUid { - NSString * uid = [[AccountInfoStorage instance] getUid]; - [Api cleanMicroGiftValue:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] cleanUserGiftValueSuccess:data.data]; - }] roomUid:roomUid micUid:micUid uid:uid]; + NSString * uid = [[AccountInfoStorage instance] getUid]; + [Api cleanMicroGiftValue:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [[self getView] cleanUserGiftValueSuccess:data.data]; + }] roomUid:roomUid micUid:micUid uid:uid]; } @@ -564,10 +573,10 @@ /// @param roomUid 房主的uid /// @param chosenUserId 被选择的uid - (void)pickHeartUser:(NSString *)roomUid chosenUserId:(NSString *)chosenUserId { - NSString * uid = [[AccountInfoStorage instance] getUid]; - [Api roomDatingPickUser:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] roomDatingPickHeartUserSuccess]; - }] roomUserId:roomUid chosenUserId:chosenUserId electorUserId:uid]; + NSString * uid = [[AccountInfoStorage instance] getUid]; + [Api roomDatingPickUser:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [[self getView] roomDatingPickHeartUserSuccess]; + }] roomUserId:roomUid chosenUserId:chosenUserId electorUserId:uid]; } @@ -576,70 +585,61 @@ /// @param opt 1: 设置为管理员;2:设置普通等级用户;-1:设为黑名单用户;-2:设为禁言用户 /// @param roomUid 房主的uid - (void)superAdminHandleUser:(NSString *)targetUid opt:(NSString *)opt roomUid:(NSString *)roomUid isSet:(BOOL)isSet{ - [Api superAdminHandleUser:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - [[self getView] superAdminHandleUserSuccess:opt]; - }] roomUid:roomUid targetUid:targetUid opt:opt isSet:@(isSet)]; + [Api superAdminHandleUser:[self createHttpCompletion:^(BaseModel * _Nonnull data) { + [[self getView] superAdminHandleUserSuccess:opt]; + }] roomUid:roomUid targetUid:targetUid opt:opt isSet:@(isSet)]; } #pragma mark - Private Method ///获取房间角色 - (RACSignal *)rac_queryChatRoomMember:(NSString *)uid roomId:(NSString *)roomId{ - return [RACSignal createSignal:^RACDisposable *(id subscriber) { - NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; - request.roomId = roomId; + return [RACSignal createSignal:^RACDisposable *(id subscriber) { + NIMChatroomMembersByIdsRequest *request = [[NIMChatroomMembersByIdsRequest alloc]init]; + request.roomId = roomId; if(uid != nil){ request.userIds = @[uid]; } - [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { - if (error == nil) { - [subscriber sendNext:members.firstObject]; - [subscriber sendCompleted]; - }else { - [subscriber sendNext:nil]; - [subscriber sendCompleted]; - } - }]; - return nil; - }]; -} -/// 记录踢人名单列表 -/// @param roomUid 房间id -/// @param uid 用户id --(void)recordsKickUserListWithRoomUid:(NSString *)roomUid uid:(NSString *)uid{ - [Api recordskickUserList:[self createHttpCompletion:^(BaseModel * _Nonnull data) { - - } fail:^(NSInteger code, NSString * _Nullable msg) { - - } showLoading:NO errorToast:NO] roomUid:roomUid uid:uid ]; + [[NIMSDK sharedSDK].chatroomManager fetchChatroomMembersByIds:request completion:^(NSError * _Nullable error, NSArray * _Nullable members) { + if (error == nil) { + [subscriber sendNext:members.firstObject]; + [subscriber sendCompleted]; + }else { + [subscriber sendNext:nil]; + [subscriber sendCompleted]; + } + }]; + return nil; + }]; } + #pragma mark - Getters And Setters - (NSMutableArray *)functionArray { - if (!_functionArray) { - _functionArray = [NSMutableArray array]; - } - return _functionArray; + if (!_functionArray) { + _functionArray = [NSMutableArray array]; + } + return _functionArray; } - (XPUserCardItemModel *)giftItem { - if (!_giftItem) { - _giftItem = [[XPUserCardItemModel alloc] init]; - _giftItem.title = YMLocalizedString(@"XPUserCardPresenter13"); - _giftItem.imageName = @"usercard_sendgift_normal"; - _giftItem.selectImageName = @"usercard_sendgift_normal"; - _giftItem.type = UserCardItemType_Gift; - } - return _giftItem; + if (!_giftItem) { + _giftItem = [[XPUserCardItemModel alloc] init]; + _giftItem.title = YMLocalizedString(@"XPUserCardPresenter13"); + _giftItem.imageName = @"usercard_sendgift_normal"; + _giftItem.selectImageName = @"usercard_sendgift_normal"; + _giftItem.type = UserCardItemType_Gift; + } + return _giftItem; } - (XPUserCardItemModel *)chatItem { - if (!_chatItem) { - _chatItem = [[XPUserCardItemModel alloc] init]; - _chatItem.title = YMLocalizedString(@"XPUserCardPresenter14"); - _chatItem.imageName = @"usercard_chat_normal"; - _chatItem.selectImageName = @"usercard_chat_normal"; - _chatItem.type = UserCardItemType_Chat; - } - return _chatItem; + if (!_chatItem) { + _chatItem = [[XPUserCardItemModel alloc] init]; + _chatItem.title = YMLocalizedString(@"XPUserCardPresenter14"); + _chatItem.imageName = @"usercard_chat_normal"; + _chatItem.selectImageName = @"usercard_chat_normal"; + _chatItem.type = UserCardItemType_Chat; + } + return _chatItem; } - (XPUserCardItemModel *)atItem { @@ -654,48 +654,48 @@ } - (XPUserCardItemModel *)attentionItem { - if (!_attentionItem) { - _attentionItem = [[XPUserCardItemModel alloc] init]; - _attentionItem.title = YMLocalizedString(@"StageView29"); - _attentionItem.imageName = @"usercard_attention_normal"; - _attentionItem.selectTitle = YMLocalizedString(@"XPUserCardPresenter16"); - _attentionItem.selectImageName = @"usercard_attention_disable"; - _attentionItem.type = UserCardItemType_Attention; - } - return _attentionItem; + if (!_attentionItem) { + _attentionItem = [[XPUserCardItemModel alloc] init]; + _attentionItem.title = YMLocalizedString(@"XPUserCardPresenter15"); + _attentionItem.imageName = @"usercard_attention_normal"; + _attentionItem.selectTitle = YMLocalizedString(@"XPUserCardPresenter16"); + _attentionItem.selectImageName = @"usercard_attention_disable"; + _attentionItem.type = UserCardItemType_Attention; + } + return _attentionItem; } - ( XPUserCardItemModel *)kikoutItem { - if (!_kikoutItem) { - _kikoutItem = [[XPUserCardItemModel alloc] init]; - _kikoutItem.title = YMLocalizedString(@"XPUserCardPresenter17"); - _kikoutItem.imageName = @"usercard_kickout_normal"; - _kikoutItem.selectImageName = @"usercard_kickout_normal"; - _kikoutItem.type = UserCardItemType_KickOut; - } - return _kikoutItem; + if (!_kikoutItem) { + _kikoutItem = [[XPUserCardItemModel alloc] init]; + _kikoutItem.title = YMLocalizedString(@"XPUserCardPresenter17"); + _kikoutItem.imageName = @"usercard_kickout_normal"; + _kikoutItem.selectImageName = @"usercard_kickout_normal"; + _kikoutItem.type = UserCardItemType_KickOut; + } + return _kikoutItem; } - (XPUserCardItemModel *)managerItem { - if (!_managerItem) { - _managerItem = [[XPUserCardItemModel alloc] init]; - _managerItem.title = YMLocalizedString(@"XPUserCardPresenter18"); - _managerItem.imageName = @"usercard_manager_normal"; - _managerItem.selectTitle = YMLocalizedString(@"XPUserCardPresenter19"); - _managerItem.selectImageName = @"usercard_manager_disable"; - _managerItem.type = UserCardItemType_Manager; - } - return _managerItem; + if (!_managerItem) { + _managerItem = [[XPUserCardItemModel alloc] init]; + _managerItem.title = YMLocalizedString(@"XPUserCardPresenter18"); + _managerItem.imageName = @"usercard_manager_normal"; + _managerItem.selectTitle = YMLocalizedString(@"XPUserCardPresenter19"); + _managerItem.selectImageName = @"usercard_manager_disable"; + _managerItem.type = UserCardItemType_Manager; + } + return _managerItem; } - (XPUserCardItemModel *)blackItem { - if (!_blackItem) { - _blackItem = [[XPUserCardItemModel alloc] init]; - _blackItem.title = YMLocalizedString(@"XPUserCardPresenter20"); - _blackItem.imageName = @"usercard_blacklist_normal"; - _blackItem.type = UserCardItemType_Black; - } - return _blackItem; + if (!_blackItem) { + _blackItem = [[XPUserCardItemModel alloc] init]; + _blackItem.title = YMLocalizedString(@"XPUserCardPresenter20"); + _blackItem.imageName = @"usercard_blacklist_normal"; + _blackItem.type = UserCardItemType_Black; + } + return _blackItem; } @end diff --git a/YuMi/Modules/YMRoom/View/UserCard/Protocol/XPUserCardProtocol.h b/YuMi/Modules/YMRoom/View/UserCard/Protocol/XPUserCardProtocol.h index 0717047f..730ddc4d 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/Protocol/XPUserCardProtocol.h +++ b/YuMi/Modules/YMRoom/View/UserCard/Protocol/XPUserCardProtocol.h @@ -1,8 +1,8 @@ // -// YMUserCardProtocol.h -// YUMI +// XPUserCardProtocol.h +// xplan-ios // -// Created by YUMI on 2021/11/24. +// Created by 冯硕 on 2021/11/24. // #import @@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN ///获取用户信息成功 - (void)onGetUserInfoSuccess:(UserInfoModel *)userInfo; + ///获取用户卡片中 functioin的数据源 - (void)onGetFunctionArraySccess:(NSArray *)array; ///获取用户卡片中 操作麦的 functioin的数据源 @@ -24,7 +25,7 @@ NS_ASSUME_NONNULL_BEGIN ///设置管理 取消管理员 成功 - (void)markUserManagerFinish:(XPUserCardItemModel *)item error:(NSError *)error; /// 踢出房间 -- (void)makeKickUserFinish:(NSError *)error uid:(NSString *)uid; +- (void)makeKickUserFinish:(NSError *)error; ///超管踢管理出房间 - (void)superAdminKickUserFinish:(NSError *)error; ///抱下麦成功 diff --git a/YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.h b/YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.h index 5d18383a..c8c0cce8 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.h +++ b/YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.h @@ -1,8 +1,8 @@ // -// ThemeColorUserCard.h -// YUMI +// ThemeColor+UserCard.h +// xplan-ios // -// Created by YUMI on 2021/11/24. +// Created by 冯硕 on 2021/11/24. // #import "DJDKMIMOMColor.h" diff --git a/YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.m b/YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.m index 42804ea7..7414e4f8 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.m +++ b/YuMi/Modules/YMRoom/View/UserCard/ThemeColor+UserCard.m @@ -1,8 +1,8 @@ // -// ThemeColorUserCard.m -// YUMI +// ThemeColor+UserCard.m +// xplan-ios // -// Created by YUMI on 2021/11/24. +// Created by 冯硕 on 2021/11/24. // #import "ThemeColor+UserCard.h" diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.h b/YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.h index ded56bcf..cb9aa34b 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.h +++ b/YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.h @@ -1,8 +1,8 @@ // -// YMUserCardItemCollectionViewCell.h -// YUMI +// XPUserCardItemCollectionViewCell.h +// xplan-ios // -// Created by YUMI on 2021/11/24. +// Created by 冯硕 on 2021/11/24. // #import diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.m b/YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.m index 5de25e17..489ef9d2 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.m +++ b/YuMi/Modules/YMRoom/View/UserCard/View/Cell/XPUserCardItemCollectionViewCell.m @@ -1,8 +1,8 @@ // -// YMUserCardItemCollectionViewCell.m -// YUMI +// XPUserCardItemCollectionViewCell.m +// xplan-ios // -// Created by YUMI on 2021/11/24. +// Created by 冯硕 on 2021/11/24. // #import "XPUserCardItemCollectionViewCell.h" @@ -41,7 +41,7 @@ make.top.mas_equalTo(self.contentView); }]; [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.contentView); + make.leading.trailing.mas_equalTo(self.contentView); make.top.mas_equalTo(self.logoButton.mas_bottom).offset(8); }]; } @@ -81,6 +81,7 @@ _titleLabel.font = [UIFont systemFontOfSize:10]; _titleLabel.textColor = [DJDKMIMOMColor userSubTitleColor]; _titleLabel.textAlignment = NSTextAlignmentCenter; + _titleLabel.numberOfLines = 2; } return _titleLabel; } diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.h b/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.h index 7f629574..e91e4d56 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.h +++ b/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.h @@ -1,8 +1,8 @@ // -// YMUserCardSkillCardView.h -// YUMI +// XPUserCardSkillCardView.h +// xplan-ios // -// Created by YUMI on 2022/1/25. +// Created by GreenLand on 2022/1/25. // #import diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.m b/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.m index ef1090ed..5da3a890 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.m +++ b/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCardView.m @@ -1,8 +1,8 @@ // -// YMUserCardSkillCardView.m -// YUMI +// XPUserCardSkillCardView.m +// xplan-ios // -// Created by YUMI on 2022/1/25. +// Created by GreenLand on 2022/1/25. // #import "XPUserCardSkillCardView.h" @@ -12,7 +12,6 @@ ///Tool #import "YUMIMacroUitls.h" #import "ThemeColor+UserCard.h" -#import "NSArray+Safe.h" @interface XPUserCardSkillCardView() @@ -36,7 +35,7 @@ - (void)initContraints { [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.top.right.bottom.mas_equalTo(0); + make.leading.top.trailing.bottom.mas_equalTo(0); }]; } diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.h b/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.h index 9d364941..f42a0997 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.h +++ b/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.h @@ -1,8 +1,8 @@ // -// YMUserCardSkillCollectionViewCell.h -// YUMI +// XPUserCardSkillCollectionViewCell.h +// xplan-ios // -// Created by YUMI on 2022/1/25. +// Created by GreenLand on 2022/1/25. // #import diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.m b/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.m index 8ded8fab..bf37f551 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.m +++ b/YuMi/Modules/YMRoom/View/UserCard/View/SubViews/XPUserCardSkillCollectionViewCell.m @@ -1,8 +1,8 @@ // -// YMUserCardSkillCollectionViewCell.m -// YUMI +// XPUserCardSkillCollectionViewCell.m +// xplan-ios // -// Created by YUMI on 2022/1/25. +// Created by GreenLand on 2022/1/25. // #import "XPUserCardSkillCollectionViewCell.h" @@ -26,7 +26,7 @@ - (void)initSubViewConstraints { [self.imageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(0); + make.leading.trailing.mas_equalTo(0); make.top.bottom.mas_equalTo(self.contentView).inset(5); }]; } diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.h b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.h index c37aede0..276a7f4e 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.h +++ b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.h @@ -1,25 +1,22 @@ // -// YMUserCardViewController.h -// YUMI +// XPUserCardViewController.h +// xplan-ios // -// Created by YUMI on 2021/11/24. +// Created by 冯硕 on 2021/11/24. // #import "MvpViewController.h" #import "RoomhostDelegate.h" #import "XPUserCardInfoModel.h" NS_ASSUME_NONNULL_BEGIN - @protocol XPUserCardViewControllerDelegate -(void)clickChatAction; @end - @interface XPUserCardViewController : MvpViewController -@property(nonatomic,weak) iddelegate; - (instancetype)initWithUser:(XPUserCardInfoModel *)cardInfo; - +@property(nonatomic,weak) iddelegate; @end NS_ASSUME_NONNULL_END diff --git a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m index cda0706e..8b307cc8 100644 --- a/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m +++ b/YuMi/Modules/YMRoom/View/UserCard/View/XPUserCardViewController.m @@ -1,8 +1,8 @@ // -// YMUserCardViewController.m -// YUMI +// XPUserCardViewController.m +// xplan-ios // -// Created by YUMI on 2021/11/24. +// Created by 冯硕 on 2021/11/24. // #import "XPUserCardViewController.h" @@ -14,15 +14,10 @@ #import "ThemeColor+UserCard.h" #import "TTPopup.h" #import "YUMIHtmlUrl.h" -#import "XNDJTDDLoadingTool.h" #import "AccountInfoStorage.h" #import "SpriteSheetImageManager.h" #import "UIImage+Utils.h" #import "XCCurrentVCStackManager.h" -#import "StatisticsServiceHelper.h" -#import "NSArray+Safe.h" -#import "NSMutableDictionary+Saft.h" -#import "ClientConfig.h" ///Model #import "UserInfoModel.h" #import "XPUserCardItemModel.h" @@ -45,9 +40,10 @@ ///VC #import "XPWebViewController.h" #import "XPMineUserInfoViewController.h" -#import "XPMineSimpleUserInfoViewController.h" #import "SessionViewController.h" + + @interface XPUserCardViewController () ///上面点击的view @property (nonatomic,strong) UIView *topTapView; @@ -74,7 +70,7 @@ ///名字 @property (nonatomic,strong) UILabel *nickLabel; ///性别 -@property (nonatomic,strong) UIButton *sexImageView; +@property (nonatomic,strong) UIImageView *sexImageView; ///新用户 @property (nonatomic,strong) UIImageView *newUserImageView; ///官方的 @@ -95,8 +91,7 @@ @property (nonatomic,strong) UILabel *nameplateLabel; ///ID @property (nonatomic,strong) UILabel *idLabel; -///复制ID -@property (nonatomic,strong) UIImageView *copysIdImageView; + ///举报 @property (nonatomic,strong) UIButton *reportButton; ///关闭 @@ -117,11 +112,12 @@ @property (nonatomic,strong) XPUserCardInfoModel *cardInfo; ///数据源 @property (nonatomic,copy) NSArray *datasource; -///操作麦序的数据 -@property (nonatomic,copy) NSArray * microItems; + ///目标用户的信息 @property (nonatomic,strong) UserInfoModel *targetUserInfo; + + @end @implementation XPUserCardViewController @@ -174,7 +170,6 @@ [self.userInfoView addSubview:self.sexImageView]; [self.userInfoView addSubview:self.tagStackView]; [self.userInfoView addSubview:self.idLabel]; - [self.userInfoView addSubview:self.copysIdImageView]; [self.userInfoView addSubview:self.reportButton]; [self.userInfoView addSubview:self.closeButton]; ///用户信息中的标签 @@ -193,18 +188,18 @@ - (void)initSubViewConstraints { [self.topTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.top.left.right.mas_equalTo(self.view); + make.top.leading.trailing.mas_equalTo(self.view); make.bottom.mas_equalTo(self.backView.mas_top); }]; [self.backView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.mas_equalTo(self.view).inset(45); + make.leading.trailing.mas_equalTo(self.view).inset(45); make.centerY.mas_equalTo(self.view); make.bottom.mas_equalTo(self.stackView.mas_bottom); }]; [self.bottomTapView mas_makeConstraints:^(MASConstraintMaker *make) { - make.bottom.left.right.mas_equalTo(self.view); + make.bottom.leading.trailing.mas_equalTo(self.view); make.top.mas_equalTo(self.backView.mas_bottom); }]; @@ -221,8 +216,8 @@ [self.nobleImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(180); make.top.mas_equalTo(self.backView).mas_offset(-70); - make.right.mas_equalTo(self.backView).offset(nobleMargin*0.5); - make.left.mas_equalTo(self.backView).mas_offset(-nobleMargin*0.5); + make.trailing.mas_equalTo(self.backView).offset(nobleMargin*0.5); + make.leading.mas_equalTo(self.backView).mas_offset(-nobleMargin*0.5); }]; [self.skillCardView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.mas_equalTo(self.userInfoView); @@ -252,7 +247,7 @@ [self.avatarImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(50, 50)); - make.left.mas_equalTo(self.userInfoView).offset(15); + make.leading.mas_equalTo(self.userInfoView).offset(15); make.top.mas_equalTo(self.userInfoView).offset(30); }]; @@ -263,55 +258,53 @@ }]; [self.nobleIconImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.headWearImageView.mas_right).offset(5); + make.leading.mas_equalTo(self.headWearImageView.mas_trailing).offset(5); make.top.mas_equalTo(self.avatarImageView); make.height.mas_equalTo(20); make.width.mas_equalTo(0); }]; [self.nickLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nobleIconImageView.mas_right); + make.leading.mas_equalTo(self.nobleIconImageView.mas_trailing); make.top.mas_equalTo(self.avatarImageView); }]; [self.sexImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(28, 14)); - make.left.mas_equalTo(self.nickLabel.mas_right).offset(4); + make.size.mas_equalTo(CGSizeMake(14, 14)); + make.leading.mas_equalTo(self.nickLabel.mas_trailing).offset(4); make.centerY.mas_equalTo(self.nickLabel); }]; [self.tagStackView mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nobleIconImageView); + make.leading.mas_equalTo(self.nobleIconImageView); make.top.mas_equalTo(self.nobleIconImageView.mas_bottom).offset(3); make.height.mas_equalTo(20); }]; [self.idLabel mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nobleIconImageView); + make.leading.mas_equalTo(self.nobleIconImageView); make.top.mas_equalTo(self.tagStackView.mas_bottom).offset(3); }]; - - [self.copysIdImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.size.mas_equalTo(CGSizeMake(15, 15)); - make.left.mas_equalTo(self.idLabel.mas_right).offset(2); - make.centerY.mas_equalTo(self.idLabel); - }]; [self.closeButton mas_makeConstraints:^(MASConstraintMaker *make) { make.size.mas_equalTo(CGSizeMake(22, 22)); make.top.mas_equalTo(self.userInfoView).offset(5); - make.right.mas_equalTo(self.userInfoView).offset(-6); + make.trailing.mas_equalTo(self.userInfoView).offset(-6); }]; [self.reportButton mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.mas_equalTo(self.closeButton); - make.right.mas_equalTo(self.closeButton.mas_left).offset(-5); + make.trailing.mas_equalTo(self.closeButton.mas_leading).offset(-5); }]; + [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.mas_equalTo(20); + }]; + [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { + make.width.height.mas_equalTo(20); + }]; - - [self.newUserImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.width.height.mas_equalTo(15); }]; @@ -329,12 +322,12 @@ [self.nameplateImageView mas_makeConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(20); make.width.mas_equalTo(60); - make.left.top.mas_equalTo(self.namePlateView); + make.leading.top.mas_equalTo(self.namePlateView); }]; [self.nameplateLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.top.bottom.mas_equalTo(self.nameplateImageView); - make.right.mas_equalTo(self.namePlateView).offset(-2); + make.trailing.mas_equalTo(self.namePlateView).offset(-2); }]; [self.pickHeartView mas_makeConstraints:^(MASConstraintMaker *make) { @@ -343,7 +336,7 @@ }]; [self.pickHeartButton mas_makeConstraints:^(MASConstraintMaker *make) { - make.left.right.centerY.mas_equalTo(self.pickHeartView); + make.leading.trailing.centerY.mas_equalTo(self.pickHeartView); make.height.mas_equalTo(30); }]; } @@ -361,7 +354,7 @@ - (void)initHttp { [self.presenter getUserInfo:self.cardInfo.uid]; [self.presenter getFunctionItemsByUserInfo:self.cardInfo]; - [self.presenter getMicroFunctionItemsByUserInfo:self.cardInfo]; + } - (void)configRoomDatingPickHeart { @@ -388,12 +381,12 @@ NSInteger page = array.count / 4; if (page > 0) { if (array.count % 4 ==0) { - collectionHeight += (page * 55 + (page-1) * 16); + collectionHeight += (page * 60 + (page-1) * 16); } else { - collectionHeight += ((page + 1) * 55 + page * 16); + collectionHeight += ((page + 1) * 60 + page * 16); } } else { - collectionHeight += 55; + collectionHeight += 60; } [self.collectionView mas_updateConstraints:^(MASConstraintMaker *make) { make.height.mas_equalTo(collectionHeight); @@ -527,71 +520,49 @@ make.width.mas_equalTo(20); }]; [self.nickLabel mas_updateConstraints:^(MASConstraintMaker *make) { - make.left.mas_equalTo(self.nobleIconImageView.mas_right).mas_offset(2); + make.leading.mas_equalTo(self.nobleIconImageView.mas_trailing).mas_offset(2); }]; } NSString * nick = userInfo.nick; - if (nick.length > 8) { - nick = [NSString stringWithFormat:@"%@…", [nick substringToIndex:8]]; + if (nick.length > 10) { + nick = [NSString stringWithFormat:@"%@…", [nick substringToIndex:10]]; } self.nickLabel.text = nick.length > 0 ? nick : @""; - - [self.sexImageView setTitle:[NSString getAgeWithBirth:userInfo.birth] forState:UIControlStateNormal]; - self.sexImageView.backgroundColor = userInfo.gender == GenderType_Male ? UIColorFromRGB(0x6BB3FF) :UIColorFromRGB(0xFF80CC); - self.sexImageView.titleEdgeInsets = userInfo.gender != GenderType_Male ? UIEdgeInsetsMake(0, 2, 0, 0):UIEdgeInsetsMake(0, -1, 0, 0); - self.sexImageView.selected = userInfo.gender != GenderType_Male; + self.sexImageView.image = userInfo.gender == GenderType_Female ? [UIImage imageNamed:@"common_female"] : [UIImage imageNamed:@"common_male"]; self.officalImageView.hidden = userInfo.defUser != UserLevelType_Offical; self.newUserImageView.hidden = !userInfo.newUser; if (userInfo.newUser) { if (userInfo.fromSayHelloChannel) { - self.newUserImageView.image = [UIImage getLanguageImage:@"room_new_user_greet_new"]; + self.newUserImageView.image = [UIImage imageNamed:@"room_new_user_greet_new"]; } else { self.newUserImageView.image = [UIImage imageNamed:@"common_new_user"]; } } if (userInfo.userLevelVo.experUrl) { - [self.experImageView loadImageWithUrl:userInfo.userLevelVo.experUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - self.experImageView.image = image; - CGFloat width = image.size.width*20/ (image.size.height > 0 ? image.size.height : 1); - [self.experImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(width); - }]; - }];; + self.experImageView.imageUrl = userInfo.userLevelVo.experUrl; } self.experImageView.hidden = userInfo.userLevelVo.experUrl.length <= 0; if (userInfo.userLevelVo.charmUrl) { - - [self.charmImageView loadImageWithUrl:userInfo.userLevelVo.charmUrl completion:^(UIImage * _Nonnull image, NSURL * _Nonnull url) { - self.charmImageView.image = image; - CGFloat width = image.size.width*20/ (image.size.height > 0 ? image.size.height : 1); - [self.charmImageView mas_makeConstraints:^(MASConstraintMaker *make) { - make.height.mas_equalTo(20); - make.width.mas_equalTo(width); - }]; - }];; + self.charmImageView.imageUrl = userInfo.userLevelVo.charmUrl; } self.charmImageView.hidden = userInfo.userLevelVo.charmUrl.length <= 0; - self.copysIdImageView.hidden = NO; - if(userInfo.isCustomWord == YES){ - if ( userInfo.nameplatePic.length>0) { - self.nameplateImageView.imageUrl = userInfo.nameplatePic; - self.namePlateView.hidden = NO; - } else { - self.namePlateView.hidden = YES; - } - }else{ - if (userInfo.nameplateWord.length>0 && userInfo.nameplatePic.length>0) { - self.nameplateImageView.imageUrl = userInfo.nameplatePic; - self.nameplateLabel.text = userInfo.nameplateWord; - self.namePlateView.hidden = NO; - } else { - self.namePlateView.hidden = YES; - } - } - self.idLabel.text = [NSString stringWithFormat:@"ID：%ld", userInfo.erbanNo]; + if (userInfo.nameplateWord.length>0 && userInfo.nameplatePic.length>0) { + self.nameplateImageView.imageUrl = userInfo.nameplatePic; + self.nameplateLabel.text = userInfo.nameplateWord; + self.namePlateView.hidden = NO; + } else { + self.namePlateView.hidden = YES; + } + NSString *text = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController0"), userInfo.erbanNo]; + NSMutableAttributedString *textAtt = [[NSMutableAttributedString alloc]initWithString:[NSString stringWithFormat:@"%@ ",text] attributes:@{NSForegroundColorAttributeName:self.idLabel.textColor}]; + NSTextAttachment * attachment = [[NSTextAttachment alloc] init]; + UIImage *iconImage = [UIImage imageNamed:@"user_card_copy_id"];; + attachment.bounds = CGRectMake(0, roundf(self.idLabel.font.capHeight - iconImage.size.height)/2.f, iconImage.size.width, iconImage.size.height); + attachment.image = iconImage; + [textAtt insertAttributedString:[NSMutableAttributedString attributedStringWithAttachment:attachment] atIndex:textAtt.length]; + self.idLabel.attributedText = textAtt; NSString * headwearUrl= userInfo.headwearEffect.length > 0 ? userInfo.headwearEffect : userInfo.headwearPic; self.headWearImageView.hidden = headwearUrl.length <= 0; @@ -614,32 +585,64 @@ make.height.mas_equalTo(30); }]; } + + self.skillCardView.dataArray = userInfo.absCardPics; } - (void)onGetFunctionArraySccess:(NSArray *)array { - if (array.count <= 0) {return;} + if (array.count <= 0) { + [self.presenter getMicroFunctionItemsByUserInfo:self.cardInfo]; + return; + } self.datasource = array; - self.collectionView.hidden = NO; - [self.collectionView reloadData]; - [self updateCollectionHeight:self.datasource]; + [self.presenter getMicroFunctionItemsByUserInfo:self.cardInfo]; + } - (void)onGetMicroFunctionArraySuccess:(NSArray *)array { if (array.count <= 0) {return;} - self.microItems = array; - self.operaStackView.hidden = NO; - self.sepLineView.hidden = NO; + +// self.operaStackView.hidden = NO; +// self.sepLineView.hidden = NO; + NSMutableArray *list = [[NSMutableArray alloc]initWithArray:self.datasource]; + NSString * myUid = [AccountInfoStorage instance].getUid; + if([myUid isEqualToString:self.cardInfo.uid] ){ + + XPUserCardItemModel *cardModel = [XPUserCardItemModel new]; + cardModel.type = UserCardMicroType_Send_Gift; + cardModel.title = YMLocalizedString(@"XPUserCardPresenter13"); + cardModel.imageName = @"usercard_sendgift_normal"; + cardModel.selectImageName = @"usercard_sendgift_normal"; + [list insertObject:cardModel atIndex:0]; + + } for (XPUserCardMicroItemModel * model in array) { - UIButton * button = [UIButton buttonWithType:UIButtonTypeCustom]; - [button setTitle:model.title forState:UIControlStateNormal]; - button.titleLabel.font = [UIFont systemFontOfSize:13]; - button.tag = model.type; - button.selected = model.status; - [button setTitleColor:[DJDKMIMOMColor userMicroTitleColor] forState:UIControlStateNormal]; - [button addTarget:self action:@selector(microButtonAction:) forControlEvents:UIControlEventTouchUpInside]; - [self.operaStackView addArrangedSubview:button]; + XPUserCardItemModel *cardModel = [XPUserCardItemModel new]; + cardModel.uid = model.uid; + cardModel.type = model.type; + cardModel.title = model.title; + cardModel.status = model.status; + cardModel.imageName = model.iconImage; + [list addObject:cardModel]; +// UIButton * button = [UIButton buttonWithType:UIButtonTypeCustom]; +// [button setTitle:model.title forState:UIControlStateNormal]; +// button.titleLabel.font = [UIFont systemFontOfSize:13]; +// button.tag = model.type; +// button.selected = model.status; +// [button setTitleColor:[DJDKMIMOMColor userMicroTitleColor] forState:UIControlStateNormal]; +// [button addTarget:self action:@selector(microButtonAction:) forControlEvents:UIControlEventTouchUpInside]; +// [self.operaStackView addArrangedSubview:button]; +// if([model.title isEqualToString:YMLocalizedString(@"XPUserCardPresenter12")]){ +// [button mas_makeConstraints:^(MASConstraintMaker *make) { +// make.width.mas_greaterThanOrEqualTo(30); +// }]; +// } } + self.datasource = list; + self.collectionView.hidden = NO; + [self.collectionView reloadData]; + [self updateCollectionHeight:self.datasource]; } - (void)attentionUserSuccess:(XPUserCardItemModel *)item { @@ -653,14 +656,12 @@ [self.collectionView reloadData]; } -- (void)makeKickUserFinish:(NSError *)error uid:(NSString *)uid{ +- (void)makeKickUserFinish:(NSError *)error { if (error == nil && self.targetUserInfo) { - NSString * roomUid = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.uid]; [self dismissViewControllerAnimated:YES completion:nil]; [self sendCustomMessageKickOrBlackUser:CustomMessageType_Kick_User second:Custom_Message_Sub_Kick_BeKicked]; - [self.presenter recordsKickUserListWithRoomUid:roomUid uid:uid]; } else if (error.code == 404) { - [self showErrorToast:YMLocalizedString(@"XPUserCardViewController0")]; + [self showErrorToast:YMLocalizedString(@"XPUserCardViewController1")]; } } @@ -694,7 +695,7 @@ } [self sendCustomMessageKickOrBlackUser:CustomMessageType_Kick_User second:Custom_Message_Sub_Kick_BlackList]; } else if (error.code == 417) { - [self showErrorToast:YMLocalizedString(@"XPUserCardViewController1")]; + [self showErrorToast:YMLocalizedString(@"XPUserCardViewController2")]; } } @@ -718,7 +719,7 @@ } - (void)cleanUserGiftValueSuccess:(NSDictionary *)dic { - [self showSuccessToast:YMLocalizedString(@"XPUserCardViewController2")]; + [self showSuccessToast:YMLocalizedString(@"XPUserCardViewController3")]; NIMMessage * message = [[NIMMessage alloc] init]; AttachmentModel * attachMent = [[AttachmentModel alloc] init]; attachMent.first = CustomMessageType_Room_GiftValue; @@ -739,7 +740,7 @@ } - (void)superAdminHandleUserSuccess:(NSString *)opt { - [self showSuccessToast:YMLocalizedString(@"XPUserCardViewController3")]; + [self showSuccessToast:YMLocalizedString(@"XPUserCardViewController4")]; [self dismissViewControllerAnimated:YES completion:nil]; if ([opt isEqualToString:@"-1"]) {///拉黑 if (self.cardInfo.position.length > 0) { @@ -773,14 +774,62 @@ meIsSuperAdmin = YES; } } + + if (self.datasource.count > 0) { XPUserCardItemModel * model = [self.datasource safeObjectAtIndex1:indexPath.item]; NSString * roomId = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.roomId];; NSString * roomUid = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.uid];; switch (model.type) { + case UserCardMicroType_UpDown: + { + if (model.status) { + if ([self isInSudGame:self.cardInfo.uid]) { + if (self.cardInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { + [self showErrorToast:YMLocalizedString(@"XPUserCardViewController18")]; + [self dismissViewControllerAnimated:YES completion:nil]; + } else { + TTAlertConfig *config = [[TTAlertConfig alloc] init]; + config.message = YMLocalizedString(@"XPUserCardViewController19"); + [TTPopup alertWithConfig:config confirmHandler:^{ + [self.presenter kickDownMicro:self.cardInfo.position roomId:roomId]; + } cancelHandler:^{ + }]; + } + + return; + }else { + [self.presenter kickDownMicro:self.cardInfo.position roomId:roomId]; + } + } else { + self.operaStackView.hidden = YES; + int micCount = self.cardInfo.roomInfo.type == RoomType_Anchor ? 4 : self.cardInfo.roomInfo.type == RoomType_MiniGame ? 6 : 9; + [self.presenter getRoomMicroItems:micCount cardInfo:self.cardInfo]; + } + } + break; + case UserCardMicroType_Lock: + [self.presenter microLock:roomUid state:model.status position:self.cardInfo.position]; + break; + case UserCardMicroType_Mute: + [self.presenter microMute:roomUid state:model.status position:self.cardInfo.position]; + break; + case UserCardMicroType_Clean_Gift_Value: + [self.presenter cleanUserGiftValue:roomUid micUid:self.cardInfo.uid]; + break; + case UserCardMicroType_Send_Gift: + { + [self dismissViewControllerAnimated:NO completion:nil]; + NSString * roomUid = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.uid]; + XPSendGiftView * giftView = [[XPSendGiftView alloc] initWithType:SendGiftType_Room uid:roomUid]; + giftView.delegate = self.cardInfo.delegate; + NSArray *users = [self configGiftUsers:self.cardInfo.delegate.getMicroQueue]; + [giftView configGiftUsers:users]; + [self.presentingViewController presentViewController:giftView animated:YES completion:nil]; + break; + } case UserCardItemType_Chat: { - [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"chat"}]; if(self.delegate && [self.delegate respondsToSelector:@selector(clickChatAction)]){ [self.delegate clickChatAction]; } @@ -800,7 +849,6 @@ break; case UserCardItemType_Gift: { - [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"sendGift"}]; [self dismissViewControllerAnimated:NO completion:nil]; NSString * roomUid = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.uid]; XPSendGiftView * giftView = [[XPSendGiftView alloc] initWithType:SendGiftType_Room uid:roomUid]; @@ -811,25 +859,23 @@ } break; case UserCardItemType_Attention: - [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"attention"}]; [self.presenter attentionUser:self.cardInfo.uid status:!model.isSelect]; break; case UserCardItemType_KickOut: { - [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"kickout"}]; // 1、判断是否为防被踢用户 if (self.targetUserInfo.userVipInfoVO.preventKick) { //2、判断是否为管理员操作 if (self.cardInfo.roomInfo.uid != [AccountInfoStorage instance].getUid.integerValue) { - [self showErrorToast:[NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController4"), self.targetUserInfo.userVipInfoVO.vipName]]; + [self showErrorToast:[NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController5"), self.targetUserInfo.userVipInfoVO.vipName]]; } else {//房主操作 - NSString *message = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController5"), self.targetUserInfo.userVipInfoVO.vipName]; + NSString *message = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController6"), self.targetUserInfo.userVipInfoVO.vipName]; TTAlertConfig *config = [[TTAlertConfig alloc] init]; config.title = @""; config.message = message; [TTPopup alertWithConfig:config confirmHandler:^{ if ([self isInSudGame:self.cardInfo.uid]) { - NSString *message = YMLocalizedString(@"XPUserCardViewController6"); + NSString *message = YMLocalizedString(@"XPUserCardViewController7"); TTAlertConfig *config = [[TTAlertConfig alloc] init]; config.title = @""; config.message = message; @@ -846,7 +892,7 @@ return; } if ([self isInSudGame:self.cardInfo.uid]) { - NSString *message = YMLocalizedString(@"XPUserCardViewController6"); + NSString *message = YMLocalizedString(@"XPUserCardViewController8"); TTAlertConfig *config = [[TTAlertConfig alloc] init]; config.title = @""; config.message = message; @@ -859,9 +905,9 @@ } cancelHandler:^{ }]; } else { - NSString *message = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController8"),self.targetUserInfo.nick]; + NSString *message = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController9"),self.targetUserInfo.nick]; TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.title = YMLocalizedString(@"XPUserCardViewController9"); + config.title = YMLocalizedString(@"XPUserCardViewController10"); config.message = message; [TTPopup alertWithConfig:config confirmHandler:^{ if (meIsSuperAdmin) { @@ -876,20 +922,19 @@ break; case UserCardItemType_Black: { - [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"blacklist"}]; // 1、判断是否为防被踢用户 if (self.targetUserInfo.userVipInfoVO.preventKick) { //2、判断是否为管理员操作 if (self.cardInfo.roomInfo.uid != [AccountInfoStorage instance].getUid.integerValue) { - [self showErrorToast:[NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController4"), self.targetUserInfo.userVipInfoVO.vipName]]; + [self showErrorToast:[NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController11"), self.targetUserInfo.userVipInfoVO.vipName]]; } else {//房主操作 - NSString *message = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController11"), self.targetUserInfo.userVipInfoVO.vipName]; + NSString *message = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController12"), self.targetUserInfo.userVipInfoVO.vipName]; TTAlertConfig *config = [[TTAlertConfig alloc] init]; config.title = @""; config.message = message; [TTPopup alertWithConfig:config confirmHandler:^{ if ([self isInSudGame:self.cardInfo.uid]) { - NSString *message = YMLocalizedString(@"XPUserCardViewController6"); + NSString *message = YMLocalizedString(@"XPUserCardViewController13"); TTAlertConfig *config = [[TTAlertConfig alloc] init]; config.title = @""; config.message = message; @@ -908,7 +953,7 @@ if ([self isInSudGame:self.cardInfo.uid]) { TTAlertConfig *config = [[TTAlertConfig alloc] init]; config.title = @""; - config.message = [NSString stringWithFormat: YMLocalizedString(@"XPUserCardViewController13"), self.targetUserInfo.nick]; + config.message = [NSString stringWithFormat: YMLocalizedString(@"XPUserCardViewController14"), self.targetUserInfo.nick]; [TTPopup alertWithConfig:config confirmHandler:^{ if (meIsSuperAdmin) { [self.presenter superAdminHandleUser:self.cardInfo.uid opt:@"-1" roomUid:roomUid isSet:YES]; @@ -918,10 +963,10 @@ } cancelHandler:^{ }]; } else { - NSString *title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController14"),self.targetUserInfo.nick]; + NSString *title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController15"),self.targetUserInfo.nick]; TTAlertConfig *config = [[TTAlertConfig alloc] init]; config.title = title; - config.message = YMLocalizedString(@"XPUserCardViewController15"); + config.message = YMLocalizedString(@"XPUserCardViewController16"); [TTPopup alertWithConfig:config confirmHandler:^{ if (meIsSuperAdmin) { [self.presenter superAdminHandleUser:self.cardInfo.uid opt:@"-1" roomUid:roomUid isSet:YES]; @@ -935,7 +980,6 @@ break; case UserCardItemType_Manager: { - [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"manager"}]; if (meIsSuperAdmin) { [self.presenter superAdminHandleUser:self.cardInfo.uid opt:@"1" roomUid:roomUid isSet:!model.isSelect]; } else { @@ -945,7 +989,6 @@ break; case UserCardItemType_Invite_Micro: { - [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"invite_micro"}]; if ([AccountInfoStorage instance].getUid.integerValue == self.targetUserInfo.uid) { [self.presenter upMicro:roomId position:model.position userInfo:self.targetUserInfo]; } else { @@ -953,8 +996,8 @@ return; } NSMutableDictionary * dic = [NSMutableDictionary dictionary]; - [dic safeSetObject:@(model.position.integerValue) forKey:@"micPosition"]; - [dic safeSetObject:@(self.targetUserInfo.uid) forKey:@"uid"]; + [dic setValue:@(model.position.integerValue) forKey:@"micPosition"]; + [dic setValue:@(self.targetUserInfo.uid) forKey:@"uid"]; AttachmentModel *attachement = [[AttachmentModel alloc]init]; attachement.first = CustomMessageType_Queue; attachement.second = Custom_Message_Sub_Queue_Invite; @@ -976,9 +1019,8 @@ if(self.delegate && [self.delegate respondsToSelector:@selector(clickChatAction)]){ [self.delegate clickChatAction]; } - [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"atUser"}]; if (self.cardInfo.roomInfo.isCloseScreen) { - [self showErrorToast:YMLocalizedString(@"XPUserCardViewController16")]; + [self showErrorToast:YMLocalizedString(@"XPUserCardViewController17")]; return; } [self dismissViewControllerAnimated:NO completion:^{ @@ -1006,15 +1048,14 @@ switch (sender.tag) { case UserCardMicroType_UpDown: { - [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"downMic"}]; if (sender.selected) { if ([self isInSudGame:self.cardInfo.uid]) { if (self.cardInfo.uid.integerValue == [AccountInfoStorage instance].getUid.integerValue) { - [self showErrorToast:YMLocalizedString(@"XPUserCardViewController17")]; + [self showErrorToast:YMLocalizedString(@"XPUserCardViewController18")]; [self dismissViewControllerAnimated:YES completion:nil]; } else { TTAlertConfig *config = [[TTAlertConfig alloc] init]; - config.message = YMLocalizedString(@"XPUserCardViewController18"); + config.message = YMLocalizedString(@"XPUserCardViewController19"); [TTPopup alertWithConfig:config confirmHandler:^{ [self.presenter kickDownMicro:self.cardInfo.position roomId:roomId]; } cancelHandler:^{ @@ -1033,21 +1074,35 @@ } break; case UserCardMicroType_Lock: - [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"lockMic"}]; [self.presenter microLock:roomUid state:sender.selected position:self.cardInfo.position]; break; case UserCardMicroType_Mute: - [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"muteMic"}]; [self.presenter microMute:roomUid state:sender.selected position:self.cardInfo.position]; break; case UserCardMicroType_Clean_Gift_Value: - [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"cleanGiftValue"}]; [self.presenter cleanUserGiftValue:roomUid micUid:self.cardInfo.uid]; break; + case UserCardMicroType_Send_Gift: + { + [self dismissViewControllerAnimated:NO completion:nil]; + NSString * roomUid = [NSString stringWithFormat:@"%ld", self.cardInfo.roomInfo.uid]; + XPSendGiftView * giftView = [[XPSendGiftView alloc] initWithType:SendGiftType_Room uid:roomUid]; + giftView.delegate = self.cardInfo.delegate; + NSArray *users = [self configGiftUsers:self.cardInfo.delegate.getMicroQueue]; + [giftView configGiftUsers:users]; + [self.presentingViewController presentViewController:giftView animated:YES completion:nil]; + break; + } default: break; } } +///复制id +-(void)copyNameAction{ + [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPMineUserInfoHeaderView3")]; + UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; + pasteboard.string = [NSString stringWithFormat:@"%ld",self.targetUserInfo.erbanNo]; +} - (void)reportButtonAction:(UIButton *)sender { [self dismissViewControllerAnimated:YES completion:nil]; @@ -1058,7 +1113,6 @@ } - (void)closeButtonAction:(UIButton *)sender { - [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventroom_mike_click eventAttributes:@{@"actionType" : @"close"}]; [self dismissViewControllerAnimated:YES completion:nil]; } @@ -1068,23 +1122,16 @@ - (void)gotoUserInfoVC:(UITapGestureRecognizer *)tap { [self dismissViewControllerAnimated:YES completion:nil]; - - if ([ClientConfig shareConfig].canOpen) { - XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; - userInfoVC.uid = self.cardInfo.uid.integerValue; - [((UINavigationController *)self.presentingViewController) pushViewController:userInfoVC animated:YES]; - }else{ - XPMineSimpleUserInfoViewController * userInfoVC = [[XPMineSimpleUserInfoViewController alloc] init]; - userInfoVC.uid = self.cardInfo.uid.integerValue; - [((UINavigationController *)self.presentingViewController) pushViewController:userInfoVC animated:YES]; - } + XPMineUserInfoViewController * userInfoVC = [[XPMineUserInfoViewController alloc] init]; + userInfoVC.uid = self.cardInfo.uid.integerValue; + [((UINavigationController *)self.presentingViewController) pushViewController:userInfoVC animated:YES]; } - (void)pickHeartButtonAction:(UIButton *)sender { if (self.cardInfo.position.length > 0) { TTAlertConfig * config = [[TTAlertConfig alloc] init]; - config.title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController19"), (self.cardInfo.position.intValue + 1)]; - config.message = YMLocalizedString(@"XPUserCardViewController20"); + config.title = [NSString stringWithFormat:YMLocalizedString(@"XPUserCardViewController20"), (self.cardInfo.position.intValue + 1)]; + config.message = YMLocalizedString(@"XPUserCardViewController21"); config.messageColor = UIColorFromRGB(0xFE5D7F); config.messageFont = [UIFont systemFontOfSize:14]; [TTPopup alertWithConfig:config confirmHandler:^{ @@ -1095,12 +1142,6 @@ } } -- (void)copysIdRecognizer { - [UIPasteboard generalPasteboard].string = [NSString stringWithFormat:@"%ld", self.targetUserInfo.erbanNo]; - [XNDJTDDLoadingTool showSuccessWithMessage:YMLocalizedString(@"XPUserCardViewController21")]; - [StatisticsServiceHelper trackEventWithKey:StatisticsServiceEventID_datacard_copyid_click]; -} - #pragma mark - Getters And Setters - (UIView *)topTapView { @@ -1220,16 +1261,10 @@ return _nickLabel; } -- (UIButton *)sexImageView { +- (UIImageView *)sexImageView { if (!_sexImageView) { - _sexImageView = [[UIButton alloc] init]; - [_sexImageView setImage:kImage(@"home_age_boy_icon") forState:UIControlStateNormal]; - [_sexImageView setImage:kImage(@"home_age_girl_icon") forState:UIControlStateSelected]; - _sexImageView.titleLabel.font = [UIFont systemFontOfSize:10 weight:UIFontWeightMedium]; - [_sexImageView setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; - _sexImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0); - _sexImageView.layer.cornerRadius = 14/2; - _sexImageView.layer.masksToBounds = YES; + _sexImageView = [[UIImageView alloc] init]; + _sexImageView.userInteractionEnabled = YES; } return _sexImageView; } @@ -1247,6 +1282,7 @@ - (NetImageView *)experImageView { if (!_experImageView) { NetImageConfig * config = [[NetImageConfig alloc] init]; + config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; config.imageType = ImageTypeUserCardLevel; _experImageView = [[NetImageView alloc] initWithConfig:config]; _experImageView.userInteractionEnabled = YES; @@ -1259,6 +1295,7 @@ - (NetImageView *)charmImageView { if (!_charmImageView) { NetImageConfig * config = [[NetImageConfig alloc] init]; + config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; config.imageType = ImageTypeUserCardLevel; _charmImageView = [[NetImageView alloc] initWithConfig:config]; _charmImageView.userInteractionEnabled = YES; @@ -1271,6 +1308,7 @@ - (NetImageView *)nobleIconImageView { if (!_nobleIconImageView) { NetImageConfig * config = [[NetImageConfig alloc] init]; + config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; config.imageType = ImageTypeUserCardLevel; _nobleIconImageView = [[NetImageView alloc] initWithConfig:config]; _nobleIconImageView.contentMode = UIViewContentModeScaleAspectFit; @@ -1290,6 +1328,7 @@ - (NetImageView *)nameplateImageView { if (!_nameplateImageView) { NetImageConfig * config = [[NetImageConfig alloc] init]; + config.placeHolder = [UIImageConstant defaultAvatarPlaceholder]; config.imageType = ImageTypeUserCardLevel; _nameplateImageView = [[NetImageView alloc] initWithConfig:config]; _nameplateImageView.userInteractionEnabled = YES; @@ -1333,9 +1372,11 @@ _idLabel = [[UILabel alloc] init]; _idLabel.font = [UIFont systemFontOfSize:10]; _idLabel.textColor = [DJDKMIMOMColor textThirdColor]; - _idLabel.userInteractionEnabled = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(copysIdRecognizer)]; - [_idLabel addGestureRecognizer:tap]; + _idLabel.userInteractionEnabled = YES; + UITapGestureRecognizer *longPress = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(copyNameAction)]; + + [_idLabel addGestureRecognizer:longPress]; + } return _idLabel; } @@ -1377,7 +1418,7 @@ if (!_operaStackView) { _operaStackView = [[UIStackView alloc] init]; _operaStackView.axis = UILayoutConstraintAxisHorizontal; - _operaStackView.distribution = UIStackViewDistributionFillEqually; + _operaStackView.distribution = UIStackViewDistributionFillProportionally; _operaStackView.alignment = UIStackViewAlignmentFill; _operaStackView.spacing = 0; _operaStackView.hidden = YES; @@ -1424,16 +1465,4 @@ return _pickHeartButton; } -- (UIImageView *)copysIdImageView { - if (!_copysIdImageView) { - _copysIdImageView = [[UIImageView alloc] init]; - _copysIdImageView.userInteractionEnabled = YES; - _copysIdImageView.image = [UIImage imageNamed:@"mine_user_id_copy_white"]; - _copysIdImageView.hidden = YES; - UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(copysIdRecognizer)]; - [_copysIdImageView addGestureRecognizer:tap]; - } - return _copysIdImageView; -} - @end diff --git a/YuMi/Modules/YMRoom/View/XPRoomViewController.m b/YuMi/Modules/YMRoom/View/XPRoomViewController.m index f2fa4dfb..f5c88f9c 100644 --- a/YuMi/Modules/YMRoom/View/XPRoomViewController.m +++ b/YuMi/Modules/YMRoom/View/XPRoomViewController.m @@ -296,7 +296,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 [self.presenter getRedPacketInft:self.redEnvelopeId]; } ///获取首充次数 - [self.presenter getRoomFirstCharegWindow:self.roomUid]; +// [self.presenter getRoomFirstCharegWindow:self.roomUid]; if ([ClientConfig shareConfig].canOpen) { ///获取已解锁照片id列表 [self.presenter getUnlockRoomAlbumPhotoListWithRoomUid:self.roomUid]; @@ -356,7 +356,7 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 if([XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge == YES && self.isShowFirstRecharge == NO){ [XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge = NO; ///获取首充次数 - [self.presenter getRoomFirstCharegWindow:self.roomUid]; +// [self.presenter getRoomFirstCharegWindow:self.roomUid]; } } @@ -751,30 +751,30 @@ NSString * const kHadQuitOtherRoomKey = @"kHadQuitOtherRoomKey";//是否退出 } -(void)showRoomFirstChargeWindowFormNot:(NSNotification *)not{ - if(not != nil){ - NSDictionary *parameter = not.object; - if(parameter != nil){ - self.firstRechargeView.type = parameter[@"type"]; - self.firstRechargeView.diamonds = parameter[@"diamonds"]; - } - } - [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(showRoomFirstChargeWindow) object:nil]; - [[UIApplication sharedApplication].keyWindow addSubview:self.firstRechargeView]; - [self.presenter updateRoomFirstCharegWindow:self.roomUid]; +// if(not != nil){ +// NSDictionary *parameter = not.object; +// if(parameter != nil){ +// self.firstRechargeView.type = parameter[@"type"]; +// self.firstRechargeView.diamonds = parameter[@"diamonds"]; +// } +// } +// [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(showRoomFirstChargeWindow) object:nil]; +// [[UIApplication sharedApplication].keyWindow addSubview:self.firstRechargeView]; +// [self.presenter updateRoomFirstCharegWindow:self.roomUid]; } -(void)showRoomFirstChargeWindow{ - if([XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge == YES){ - self.isShowFirstRecharge = NO; - return; - } - UIViewController *viewController = [XCCurrentVCStackManager shareManager].getCurrentVC; - if(![viewController isKindOfClass:[XPRoomViewController class]]){ - [viewController dismissViewControllerAnimated:YES completion:nil]; - } - self.isShowFirstRecharge = NO; - [self.presenter updateRoomFirstCharegWindow:self.roomUid]; - [[UIApplication sharedApplication].keyWindow addSubview:self.firstRechargeView]; +// if([XPSkillCardPlayerManager shareInstance].isInRoomFirstRecharge == YES){ +// self.isShowFirstRecharge = NO; +// return; +// } +// UIViewController *viewController = [XCCurrentVCStackManager shareManager].getCurrentVC; +// if(![viewController isKindOfClass:[XPRoomViewController class]]){ +// [viewController dismissViewControllerAnimated:YES completion:nil]; +// } +// self.isShowFirstRecharge = NO; +// [self.presenter updateRoomFirstCharegWindow:self.roomUid]; +// [[UIApplication sharedApplication].keyWindow addSubview:self.firstRechargeView]; } diff --git a/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m b/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m index 025b9f59..14676a89 100644 --- a/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m +++ b/YuMi/Modules/YMTabbar/View/AnchorCard/XPAnchorCardView.m @@ -399,6 +399,7 @@ _genderImageView.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0); _genderImageView.layer.cornerRadius = 14/2; _genderImageView.layer.masksToBounds = YES; + } return _genderImageView; } diff --git a/YuMi/Structure/Base/BaseViewController.h b/YuMi/Structure/Base/BaseViewController.h index b0d5ba99..7ce29763 100644 --- a/YuMi/Structure/Base/BaseViewController.h +++ b/YuMi/Structure/Base/BaseViewController.h @@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN - (void)showLoading; /** - 隐藏 XCHUDTool + 隐藏 XNDJTDDLoadingTool */ - (void)hideHUD; diff --git a/YuMi/Tools/CocoaHttpServer/Web/css/index.css b/YuMi/Tools/CocoaHttpServer/Web/css/index.css old mode 100755 new mode 100644 diff --git a/YuMi/Tools/CocoaHttpServer/Web/css/reset.css b/YuMi/Tools/CocoaHttpServer/Web/css/reset.css old mode 100755 new mode 100644 diff --git a/YuMi/Tools/CocoaHttpServer/Web/images/attention.png b/YuMi/Tools/CocoaHttpServer/Web/images/attention.png old mode 100755 new mode 100644 diff --git a/YuMi/Tools/CocoaHttpServer/Web/images/button.png b/YuMi/Tools/CocoaHttpServer/Web/images/button.png old mode 100755 new mode 100644 index db656a95..290766f2 Binary files a/YuMi/Tools/CocoaHttpServer/Web/images/button.png and b/YuMi/Tools/CocoaHttpServer/Web/images/button.png differ diff --git a/YuMi/Tools/CocoaHttpServer/Web/images/delete.png b/YuMi/Tools/CocoaHttpServer/Web/images/delete.png old mode 100755 new mode 100644 diff --git a/YuMi/Tools/CocoaHttpServer/Web/images/download.png b/YuMi/Tools/CocoaHttpServer/Web/images/download.png old mode 100755 new mode 100644 diff --git a/YuMi/Tools/CocoaHttpServer/Web/images/header.png b/YuMi/Tools/CocoaHttpServer/Web/images/header.png old mode 100755 new mode 100644 index 7978b136..cef650c2 Binary files a/YuMi/Tools/CocoaHttpServer/Web/images/header.png and b/YuMi/Tools/CocoaHttpServer/Web/images/header.png differ diff --git a/YuMi/Tools/CocoaHttpServer/Web/index.html b/YuMi/Tools/CocoaHttpServer/Web/index.html old mode 100755 new mode 100644 index 747207df..eb736c09 --- a/YuMi/Tools/CocoaHttpServer/Web/index.html +++ b/YuMi/Tools/CocoaHttpServer/Web/index.html @@ -4,25 +4,25 @@ - 一键上传歌曲 +
- +
- +
-
歌曲列表
+